From aa7ea419f0791de9c3749a506b76d3abf72832e9 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 28 Jan 2020 05:49:41 -0700 Subject: [PATCH] Backed out changeset 9dce3ebb2c37 MAP_SGI_ANYADDR cannot be used in place of MAP_ANON --- lib/util/arc4random.h | 8 ++------ lib/util/getentropy.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/lib/util/arc4random.h b/lib/util/arc4random.h index e6efa1d5d..badb88ad5 100644 --- a/lib/util/arc4random.h +++ b/lib/util/arc4random.h @@ -45,12 +45,8 @@ static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; # define _ARC4_ATFORK(f) #endif -#if !defined(MAP_ANON) -# if defined(MAP_ANONYMOUS) -# define MAP_ANON MAP_ANONYMOUS -# elif defined(MAP_SGI_ANYADDR) -# define MAP_ANON MAP_SGI_ANYADDR -# endif +#if !defined(MAP_ANON) && defined(MAP_ANONYMOUS) +# define MAP_ANON MAP_ANONYMOUS #endif static inline void diff --git a/lib/util/getentropy.c b/lib/util/getentropy.c index 1f2e34afb..dc00d36b5 100644 --- a/lib/util/getentropy.c +++ b/lib/util/getentropy.c @@ -69,12 +69,8 @@ #include "sudo_digest.h" #include "sudo_rand.h" -#if !defined(MAP_ANON) -# if defined(MAP_ANONYMOUS) -# define MAP_ANON MAP_ANONYMOUS -# elif defined(MAP_SGI_ANYADDR) -# define MAP_ANON MAP_SGI_ANYADDR -# endif +#if !defined(MAP_ANON) && defined(MAP_ANONYMOUS) +# define MAP_ANON MAP_ANONYMOUS #endif #define REPEAT 5