topjohnwu/selinux
1
0
Fork 0
mirror of https://github.com/topjohnwu/selinux.git synced 2024-12-04 17:46:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libselinux: Do not define gettid() if glibc >= 2.30 is used

Browse Source 
Since version 2.30 glibc implements gettid() system call wrapper, see
https://sourceware.org/bugzilla/show_bug.cgi?id=6399

Fixes:
cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I../include -D_GNU_SOURCE  -DNO_ANDROID_BACKEND   -c -o procattr.o procattr.c
procattr.c:28:14: error: static declaration of ‘gettid’ follows non-static declaration
   28 | static pid_t gettid(void)
      |              ^~~~~~
In file included from /usr/include/unistd.h:1170,
                 from procattr.c:2:
/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here
   34 | extern __pid_t gettid (void) __THROW;
      |                ^~~~~~

Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
This commit is contained in:
Petr Lautrbach 2019-03-11 16:00:41 +01:00 committed by Stephen Smalley
parent 486aa7d991
commit 707e4b8610
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libselinux/src/procattr.c
View File

@ -22,8 +22,19 @@ static pthread_key_t destructor_key;
static int destructor_key_initialized = 0; static int destructor_key_initialized = 0;
static __thread char destructor_initialized; static __thread char destructor_initialized;
#ifndef __BIONIC__ /* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and
/* Bionic declares this in unistd.h and has a definition for it */ * has a definition for it */
#ifdef __BIONIC__
#define OVERRIDE_GETTID 0
#elif !defined(__GLIBC_PREREQ)
#define OVERRIDE_GETTID 1
#elif !__GLIBC_PREREQ(2,30)
#define OVERRIDE_GETTID 1
#else
#define OVERRIDE_GETTID 0
#endif
#if OVERRIDE_GETTID
static pid_t gettid(void) static pid_t gettid(void)
{ {
return syscall(__NR_gettid); return syscall(__NR_gettid);