Commit 6ffcd10a authored by Richard Levitte's avatar Richard Levitte
Browse files

crypto/uid.c: use own macro as guard rather than AT_SECURE 



It turns out that AT_SECURE may be defined through other means than
our inclusion of sys/auxv.h, so to be on the safe side, we define our
own guard and use that to determine if getauxval() should be used or
not.

Fixes #7932

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7933)

(cherry picked from commit aefb980c)
parent 0c13c8ec

crypto/uid.c

+2 −1
Original line number Diff line number Diff line
@@ -34,12 +34,13 @@ int OPENSSL_issetugid(void) 
# if defined(__GLIBC__) && defined(__GLIBC_PREREQ)

#  if __GLIBC_PREREQ(2, 16)

#   include <sys/auxv.h>

#   define OSSL_IMPLEMENT_GETAUXVAL

#  endif

# endif



int OPENSSL_issetugid(void)

{

# ifdef AT_SECURE

# ifdef OSSL_IMPLEMENT_GETAUXVAL

    return getauxval(AT_SECURE) != 0;

# else

    return getuid() != geteuid() || getgid() != getegid();