From 2ec0e7eade0ea1258acd5c6f5e5e9bfaeb5041a8 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Wed, 24 Jan 2018 20:35:22 -0800 Subject: Revert Intel CET changes to __jmp_buf_tag (Bug 22743) In commit cba595c350e52194e10c0006732e1991e3d0803b and commit f81ddabffd76ac9dd600b02adbf3e1dac4bb10ec, ABI compatibility with applications was broken by increasing the size of the on-stack allocated __pthread_unwind_buf_t beyond the oringal size. Applications only have the origianl space available for __pthread_unwind_register, and __pthread_unwind_next to use, any increase in the size of __pthread_unwind_buf_t causes these functions to write beyond the original structure into other on-stack variables leading to segmentation faults in common applications like vlc. The only workaround is to version those functions which operate on the old sized objects, but this must happen in glibc 2.28. Thank you to Andrew Senkevich, H.J. Lu, and Aurelien Jarno, for submitting reports and tracking the issue down. The commit reverts the above mentioned commits and testing on x86_64 shows that the ABI compatibility is restored. A tst-cleanup1 regression test linked with an older glibc now passes when run with the newly built glibc. Previously a tst-cleanup1 linked with an older glibc would segfault when run with an affected glibc build. Tested on x86_64 with no regressions. Signed-off-by: Carlos O'Donell --- .../linux/x86/bits/types/__cancel_jmp_buf_tag.h | 31 ------------------- sysdeps/unix/sysv/linux/x86/nptl/pthreadP.h | 36 ---------------------- sysdeps/unix/sysv/linux/x86/pthreaddef.h | 22 ------------- 3 files changed, 89 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/x86/bits/types/__cancel_jmp_buf_tag.h delete mode 100644 sysdeps/unix/sysv/linux/x86/nptl/pthreadP.h delete mode 100644 sysdeps/unix/sysv/linux/x86/pthreaddef.h (limited to 'sysdeps/unix/sysv/linux/x86') diff --git a/sysdeps/unix/sysv/linux/x86/bits/types/__cancel_jmp_buf_tag.h b/sysdeps/unix/sysv/linux/x86/bits/types/__cancel_jmp_buf_tag.h deleted file mode 100644 index 70efbb190c..0000000000 --- a/sysdeps/unix/sysv/linux/x86/bits/types/__cancel_jmp_buf_tag.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Define struct __cancel_jmp_buf_tag. - Copyright (C) 2017-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef ____cancel_jmp_buf_tag_defined -#define ____cancel_jmp_buf_tag_defined 1 - -#include - -struct __cancel_jmp_buf_tag - { - __jmp_buf __cancel_jmp_buf; - int __mask_was_saved; - __sigset_t __saved_mask; - }; - -#endif diff --git a/sysdeps/unix/sysv/linux/x86/nptl/pthreadP.h b/sysdeps/unix/sysv/linux/x86/nptl/pthreadP.h deleted file mode 100644 index 247a62e9a0..0000000000 --- a/sysdeps/unix/sysv/linux/x86/nptl/pthreadP.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Internal pthread header. Linux/x86 version. - Copyright (C) 2017-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include_next - -#ifndef _PTHREADP_H_X86 -#define _PTHREADP_H_X86 1 - -extern struct pthread_unwind_buf ____pthread_unwind_buf_private; - -_Static_assert (sizeof (____pthread_unwind_buf_private.cancel_jmp_buf) - >= sizeof (struct __jmp_buf_tag), - "size of cancel_jmp_buf < sizeof __jmp_buf_tag"); - -extern __pthread_unwind_buf_t ____pthread_unwind_buf; - -_Static_assert (sizeof (____pthread_unwind_buf.__cancel_jmp_buf) - >= sizeof (struct __jmp_buf_tag), - "size of __cancel_jmp_buf < sizeof __jmp_buf_tag"); - -#endif diff --git a/sysdeps/unix/sysv/linux/x86/pthreaddef.h b/sysdeps/unix/sysv/linux/x86/pthreaddef.h deleted file mode 100644 index a405a65666..0000000000 --- a/sysdeps/unix/sysv/linux/x86/pthreaddef.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Pthread macros. Linux/x86 version. - Copyright (C) 2017-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include_next - -/* Need saved_mask in cancel_jmp_buf. */ -#define NEED_SAVED_MASK_IN_CANCEL_JMP_BUF 1 -- cgit 1.4.1