isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow getentropy.c to compile when MAP_ANON is unavailable.

Browse Source
This commit is contained in:
Todd C. Miller
2020-01-28 06:59:16 -07:00
parent 13cc65038f
commit 9d69c4a022
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/util/getentropy.c
View File

@@ -100,6 +100,22 @@ static int gotdata(char *buf, size_t len);
static int getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data); static int getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data);
#endif #endif
static void *
mmap_anon(void *addr, size_t len, int prot, int flags, off_t offset)
{
#ifdef MAP_ANON
return mmap(addr, len, prot, flags | MAP_ANON, -1, offset);
#else
int fd;
if ((fd = open("/dev/zero", O_RDWR)) == -1)
return MAP_FAILED;
addr = mmap(addr, len, prot, flags, fd, offset);
close(fd);
return addr;
#endif
}
int int
sudo_getentropy(void *buf, size_t len) sudo_getentropy(void *buf, size_t len)
{ {
@@ -470,10 +486,10 @@ getentropy_fallback(void *buf, size_t len)
}; };
for (m = 0; m < sizeof mm/sizeof(mm[0]); m++) { for (m = 0; m < sizeof mm/sizeof(mm[0]); m++) {
HX(mm[m].p = mmap(NULL, HX(mm[m].p = mmap_anon(NULL,
mm[m].npg * pgs, mm[m].npg * pgs,
PROT_READ|PROT_WRITE, PROT_READ|PROT_WRITE,
MAP_PRIVATE|MAP_ANON, -1, MAP_PRIVATE,
(off_t)0), mm[m].p); (off_t)0), mm[m].p);
if (mm[m].p != MAP_FAILED) { if (mm[m].p != MAP_FAILED) {
size_t mo; size_t mo;