libselinux: Do not define gettid() if glibc >= 2.30 is used
PATCH 1/1 libselinux: Do not define gettid() if glibc >= 2.30 is used
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;
| ^~~~~~--- libselinux/src/procattr.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
libselinux/src/procattr.c +13 -2
@@ -22,8 +22,19 @@ static pthread_key_t destructor_key;static int destructor_key_initialized =0 ;static __threadchar destructor_initialized; -#ifndef __BIONIC__ -/* Bionic declares this in unistd.h and has a definition for it */ +/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and +* 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 ) {return syscall (__NR_gettid);
Signature · 1 line
2.21.0
Quoted 11 lines · Petr Lautrbach
Since version 2.30 glibc implements
gettid()system call wrapper, see
https://sourceware.org/bugzilla/show_bug.cgi?id=6399Fixes:
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.oprocattr.c
procattr.c:28:14: error: static declaration of ‘gettid’ follows non-static declaration
28 | staticpid_tgettid(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
Quoted 4 lines
34 | extern __pid_t gettid (void) __THROW; | ^~~~~~Signed-off-by Petr Lautrbach <[email protected]>
I assume the glibc change will break a lot of software out there that assumed that "never" meant "never" and rolled their own gettid() wrapper. Would have been nice if they had at least added some #define to indicate that it is now provided for easy testing rather than needing to test minor version number. Anyway, regardless,
Quoted 31 lines
--- libselinux/src/procattr.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)libselinux/src/procattr.c +13
-2@@ -22,8 +22,19 @@ static pthread_key_t destructor_key;static int destructor_key_initialized =0 ;static __threadchar destructor_initialized; -#ifndef __BIONIC__ -/* Bionic declares this in unistd.h and has a definition for it */ +/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and +* 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 ) {return syscall (__NR_gettid);
Quoted 23 lines · Stephen Smalley
Quoted 22 lines · Petr Lautrbach
Since version 2.30 glibc implements
gettid()system call wrapper, see
https://sourceware.org/bugzilla/show_bug.cgi?id=6399Fixes:
cc -O2 -g -pipe -Wall -Werror=format-security(quoted diff) +0
-7-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 | staticpid_tgettid(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 here34 | extern __pid_t gettid (void) __THROW; | ^~~~~~
Quoted 8 lines
Quoted 1 line
Signed-off-by Petr Lautrbach <[email protected]>I assume the glibc change will break a lot of software out there that assumed that "never" meant "never" and rolled their own
gettid()wrapper. Would have been nice if they had at least added some #define to indicate that it is now provided for easy testing rather than needing to test minor version number. Anyway, regardless,
I asked for an advice from glibc Fedora maintainer [1] as the current version is Fedora Rawhide is still 2.29 but it already ships gettid wrapped linked as gettid@@GLIBC_2.30. The response was that I should rename libselinux gettid() to something else in order to prevent such conflict. It would mean that libselinux won't depend on glibc implementation. But I decided to test the minor version and use the new glibc wrapper when it's possible.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1685594
Quoted 34 lines
Acked-by Stephen Smalley <[email protected]>Quoted 32 lines
--- libselinux/src/procattr.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)libselinux/src/procattr.c +0
-1@@ -22,8 +22,19 @@ static pthread_key_t destructor_key;static int destructor_key_initialized =0 ;static __threadchar destructor_initialized; -#ifndef __BIONIC__ -/* Bionic declares this in unistd.h and has a definition for it */
+/* Bionic and glibc >= 2.30 declaregettid()system call wrapper inunistd.hand
+ * has a definition for it */libselinux/src/procattr.c +11
-0+#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 ) {return syscall (__NR_gettid);
Quoted 33 lines · Petr Lautrbach
Quoted 21 lines · Stephen Smalley
Quoted 20 lines · Petr Lautrbach
Since version 2.30 glibc implements
gettid()system call wrapper, see
https://sourceware.org/bugzilla/show_bug.cgi?id=6399Fixes:
cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2(quoted diff) +0
-5-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 | staticpid_tgettid(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_tgettid (void)__THROW;
| ^~~~~~Quoted 8 lines
Quoted 1 line
Signed-off-by Petr Lautrbach <[email protected]>I assume the glibc change will break a lot of software out there that assumed that "never" meant "never" and rolled their own
gettid()wrapper. Would have been nice if they had at least added some #define to indicate that it is now provided for easy testing rather than needing to test minor version number. Anyway, regardless,
Quoted 7 lines
I asked for an advice from glibc Fedora maintainer [1] as the current version is Fedora Rawhide is still 2.29 but it already ships gettid wrapped linked as gettid@@GLIBC_2.30. The response was that I should rename libselinux
gettid()to something else in order to prevent such conflict. It would mean that libselinux won't depend on glibc implementation. But I decided to test the minor version and use the new glibc wrapper when it's possible.
Yes, your way seems better - no point in providing our own wrapper once glibc has it.
Quoted 37 lines
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1685594
Quoted 33 lines
Acked-by Stephen Smalley <[email protected]>Quoted 31 lines
---
libselinux/src/procattr.c| 15 +++++++++++++--1 file changed, 13 insertions(+), 2 deletions(-)libselinux/src/procattr.c +0
-0@@ -22,8 +22,19 @@ static pthread_key_t destructor_key; static int destructor_key_initialized = 0; static __thread char destructor_initialized;-#ifndef
__BIONIC__libselinux/src/procattr.c +1
-1-/* Bionic declares this in unistd.h and has a definition for it */ +/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in
unistd.hand
+ * has a definition for it */libselinux/src/procattr.c +11
-0+#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_tgettid(void)
{
returnsyscall(__NR_gettid);
Stephen Smalley
AppliedQuoted 21 lines · Stephen Smalley
Quoted 20 lines · Petr Lautrbach
Since version 2.30 glibc implements
gettid()system call wrapper, see
https://sourceware.org/bugzilla/show_bug.cgi?id=6399Fixes:
cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2(quoted diff) +0
-5-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 | staticpid_tgettid(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_tgettid (void)__THROW;
| ^~~~~~
Quoted 5 lines
Quoted 1 line
Signed-off-by Petr Lautrbach <[email protected]>I assume the glibc change will break a lot of software out there that assumed that "never" meant "never" and rolled their own
gettid()wrapper. Would have been nice if they had at least added some #define to indicate that it is now provided for easy testing rather than needing to test minor version number. Anyway, regardless,Acked-by Stephen Smalley <[email protected]>
Thanks, applied.
Quoted 33 lines
Quoted 32 lines
---
libselinux/src/procattr.c| 15 +++++++++++++--1 file changed, 13 insertions(+), 2 deletions(-)libselinux/src/procattr.c +1
-2@@ -22,8 +22,19 @@ static pthread_key_t destructor_key; static int destructor_key_initialized = 0; static __thread char destructor_initialized; -#ifndef __BIONIC__ -/* Bionic declares this in unistd.h and has a definition for it */ +/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in
unistd.hand
+ * has a definition for it */libselinux/src/procattr.c +11
-0+#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_tgettid(void)
{
returnsyscall(__NR_gettid);