From patchwork Wed Nov 15 13:20:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 24252 Received: (qmail 53011 invoked by alias); 15 Nov 2017 13:20:21 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 52986 invoked by uid 89); 15 Nov 2017 13:20:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-ot0-f196.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=npjXdmtQBgk3wLUa0BXAjYn9wutW1JFj0VRJU9ssUyE=; b=SQS5ujixFFocPWtEbBauAsveBXx4f1oKhMlne8rFDsgDyEdtB4QuIwukgL37XxffVQ JEqTvmfczs+bCMXeUf19NcDdDjF3O062gQz6S5mjPmnq2sagpPg1zdFDVlPT7rHGcxmS ySSBfrxUMamBaDofavUgPP+wljKMpluTmopxjdVi96MXDA/MPvlxQ07mEZhvwHD7gyRB EXyNN9W7XNbkvxUgBjcE7b8x+zc+t2Skc9nnNysuKlocrBDJh60fGMhExbpxxYtSrTqj NPrM16GPICaeQy4kUElnCZGGQRfnwvn6FuoXj+qf98/NyeCWdeVOdx6ehfpgVbDYkXY8 V6hw== X-Gm-Message-State: AJaThX7FxjlomKd8S5s31/rs9DHcdSQDB4/vyEb1kWVzlpPD+tNBBiAb loue+/EkOv4mSAusvE+G5TsaTbV7yMk+lJ45jhZ6zA== X-Google-Smtp-Source: AGs4zMZL0G/zsgiLhOXCG7/sGRtyozyf7PLd9bTnn4YEehesB36RjG11uZBqMmdekYHvT0HMpqr9pW5Pk4iFA1T2vIc= X-Received: by 10.157.12.147 with SMTP id b19mr9327673otb.229.1510752013499; Wed, 15 Nov 2017 05:20:13 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <5e692320-fe48-88c4-9440-0276f2b8795b@redhat.com> References: <20171107223908.GB46190@intel.com> <33f4a80e-b377-a9c8-1fba-c136211154be@redhat.com> <7874b7d1-bf58-4fb2-b3e3-aba07db76bfa@redhat.com> <3a270ef7-eae6-e8cb-f7bb-7de8b9a926dc@redhat.com> <08d27473-93ca-a0fe-83ac-78db1732befc@redhat.com> <5e692320-fe48-88c4-9440-0276f2b8795b@redhat.com> From: "H.J. Lu" Date: Wed, 15 Nov 2017 05:20:12 -0800 Message-ID: Subject: Re: [PATCH 2/2] jmpbuf: Add paddings for target specific usage To: Florian Weimer Cc: GNU C Library On Wed, Nov 15, 2017 at 3:10 AM, Florian Weimer wrote: > On 11/14/2017 02:10 PM, H.J. Lu wrote: >> >> +static int >> +do_test (void) >> +{ >> + sigjmp_buf sj; >> + struct support_next_to_fault sigset_t_buf >> + = support_next_to_fault_allocate (SIZEOF_SIGSET_T); >> + sigset_t *m_p = (sigset_t *) sigset_t_buf.buffer; >> + sigset_t m; >> + >> + sigemptyset (&m); >> + memcpy (m_p, &m, SIZEOF_SIGSET_T); >> + sigprocmask (SIG_SETMASK, m_p, NULL); >> + memcpy (&m, m_p, SIZEOF_SIGSET_T); >> + if (sigsetjmp (sj, 0) == 0) >> + { >> + sigaddset (&m, SIGUSR1); >> + memcpy (m_p, &m, SIZEOF_SIGSET_T); >> + sigprocmask (SIG_SETMASK, m_p, NULL); >> + memcpy (&m, m_p, SIZEOF_SIGSET_T); >> + siglongjmp (sj, 1); >> + return EXIT_FAILURE; >> + } >> + sigprocmask (SIG_SETMASK, NULL, m_p); >> + memcpy (&m, m_p, SIZEOF_SIGSET_T); >> + return sigismember (&m, SIGUSR1) ? EXIT_SUCCESS : EXIT_FAILURE; >> +} > > > Sorry, I don't understand anymore what this test is supposed to test and > how. This tests the reduced __jmp_buf_sigset_t used by __saved_mask is bigger than sigset expected by kernel. > To be honest, I don't like how you inject the internal definition of > jmp_buf. Is this the way we do it for the nptl types? I only need to make some room in /* Calling environment, plus possibly a saved signal mask. */ struct __jmp_buf_tag { /* NOTE: The machine-dependent definitions of `__sigsetjmp' assume that a `jmp_buf' begins with a `__jmp_buf' and that `__mask_was_saved' follows it. Do not move these members or add others before it. */ __jmp_buf __jmpbuf; /* Calling environment. */ int __mask_was_saved; /* Saved the signal mask? */ __sigset_t __saved_mask; /* Saved signal mask. */ }; for target specific purpose. I changed it to struct __jmp_buf_tag { /* NOTE: The machine-dependent definitions of `__sigsetjmp' assume that a `jmp_buf' begins with a `__jmp_buf' and that `__mask_was_saved' follows it. Do not move these members or add others before it. */ __jmp_buf __jmpbuf; /* Calling environment. */ int __mask_was_saved; /* Saved the signal mask? */ union { __sigset_t __saved_mask_compat; struct { __jmp_buf_sigset_t __saved_mask; /* Paddings for architecture specific usage. */ unsigned long int __padding[12]; } __saved; } __saved_mask; }; #define __saved_mask __saved_mask.__saved.__saved_mask I did only to __sigset_t in __jmp_buf_tag and this test verifies that the size of __jmp_buf_sigset_t works with sigprocmask. Are you suggesting we make some room in __sigset_t directly? This will require very extensive changes. If not, what do you exactly suggest? > I think you should check _JUMP_BUF_SIGSET_NSIG against a kernel constant > (_NSIGS?) somewhere. There is a _Static_assert in include/setjmp.h. But it isn't triggered. This updated patch moves it to sysdeps/unix/sysv/linux/__saved_mask.h. Now I got ../sysdeps/unix/sysv/linux/__saved_mask.h:32:1: error: static assertion failed: "size of ___saved_mask < size of __sigprocmask_sigset_t" _Static_assert (sizeof (___saved_mask) >= sizeof (__sigprocmask_sigset_t), if __jmp_buf_sigset_t is too small. From f5168887870e1046017e534b7b0eb8c52133d941 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 10 Jun 2017 17:23:06 -0700 Subject: [PATCH] jmpbuf: Add paddings for architecture specific usage To support Shadow Stack (SHSTK) in Intel Control-flow Enforcement Technology (CET) in setjmp/longjmp, we need to save shadow stack pointer in jmp_buf. The __saved_mask field in jmp_buf has type of __sigset_t. On Linux, __sigset_t is defined as #define _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int))) typedef struct { unsigned long int __val[_SIGSET_NWORDS]; } __sigset_t; which is much bigger than expected by the __sigprocmask system call, which has typedef struct { unsigned long sig[_NSIG_WORDS]; } sigset_t; We can shrink __sigset_t used by __saved_mask in jmp_buf to add paddings for architecture specific usage. As long as the new __sigset_t is not smaller than sigset_t expected by the __sigprocmask system call, it should work correctly. This patch adds an internal header file, , to define __jmp_buf_sigset_t for __saved_mask in jmp_buf on Linux and verifies __jmp_buf_sigset_t has the suitable size for the __sigprocmask system call. A run-time test, tst-sigsetjmp2.c, is added to verify that size of __jmp_buf_sigset_t is sufficient. If size is too small, the test fails with rt_sigprocmask(SIG_SETMASK, strace: umoven: short read (4 < 8) @0x7fa8aa28effc 0x7fa8aa28effc, NULL, 8) = -1 EFAULT (Bad address) rt_sigprocmask(SIG_SETMASK, strace: umoven: short read (4 < 8) @0x7fa8aa28effc 0x7fa8aa28effc, NULL, 8) = -1 EFAULT (Bad address) rt_sigprocmask(SIG_SETMASK, NULL, 0x7fa8aa28effc, 8) = -1 EFAULT (Bad address) exit_group(1) = ? Tested with build-many-glibcs.py. * debug/longjmp_chk.c: Include instead of . * sysdeps/unix/sysv/linux/s390/longjmp_chk.c: Likewise. * include/setjmpP.h: New file. * setjmp/setjmpP.h: Likewise. * sysdeps/generic/__jmpbuf_arch_t.h: Likewise. * sysdeps/generic/__saved_mask.h: Likewise. * sysdeps/unix/sysv/linux/__jmpbuf_arch_t.h: Likewise. * sysdeps/unix/sysv/linux/__saved_mask.h: Likewise. * setjmp/tst-sigsetjmp2.c: Likewise. * setjmp/Makefile (tests): Add tst-sigsetjmp2. * setjmp/longjmp.c: Include instead of . (__libc_siglongjmp): Cast &env[0].__saved_mask to "sigset_t *". * setjmp/sigjmp.c: Include instead of . (__sigjmp_save): Cast &env[0].__saved_mask to "sigset_t *". --- debug/longjmp_chk.c | 2 +- include/setjmpP.h | 1 + setjmp/Makefile | 2 +- setjmp/longjmp.c | 5 +-- setjmp/setjmpP.h | 32 +++++++++++++++++ setjmp/sigjmp.c | 4 +-- setjmp/tst-sigsetjmp2.c | 56 ++++++++++++++++++++++++++++++ sysdeps/generic/__jmpbuf_arch_t.h | 24 +++++++++++++ sysdeps/generic/__saved_mask.h | 20 +++++++++++ sysdeps/unix/sysv/linux/__jmpbuf_arch_t.h | 43 +++++++++++++++++++++++ sysdeps/unix/sysv/linux/__saved_mask.h | 34 ++++++++++++++++++ sysdeps/unix/sysv/linux/s390/longjmp_chk.c | 2 +- 12 files changed, 218 insertions(+), 7 deletions(-) create mode 100644 include/setjmpP.h create mode 100644 setjmp/setjmpP.h create mode 100644 setjmp/tst-sigsetjmp2.c create mode 100644 sysdeps/generic/__jmpbuf_arch_t.h create mode 100644 sysdeps/generic/__saved_mask.h create mode 100644 sysdeps/unix/sysv/linux/__jmpbuf_arch_t.h create mode 100644 sysdeps/unix/sysv/linux/__saved_mask.h diff --git a/debug/longjmp_chk.c b/debug/longjmp_chk.c index 1cea6c05ef..61be0da0cd 100644 --- a/debug/longjmp_chk.c +++ b/debug/longjmp_chk.c @@ -15,7 +15,7 @@ License along with the GNU C Library; if not, see . */ -#include +#include #define __longjmp ____longjmp_chk #define __libc_siglongjmp __longjmp_chk diff --git a/include/setjmpP.h b/include/setjmpP.h new file mode 100644 index 0000000000..8aa6a25957 --- /dev/null +++ b/include/setjmpP.h @@ -0,0 +1 @@ +#include diff --git a/setjmp/Makefile b/setjmp/Makefile index ca80b8ea13..e0a1f4a30b 100644 --- a/setjmp/Makefile +++ b/setjmp/Makefile @@ -28,7 +28,7 @@ routines := setjmp sigjmp bsd-setjmp bsd-_setjmp \ longjmp __longjmp jmp-unwind tests := tst-setjmp jmpbug bug269-setjmp tst-setjmp-fp \ - tst-sigsetjmp tst-setjmp-static + tst-sigsetjmp tst-setjmp-static tst-sigsetjmp2 tests-static := tst-setjmp-static diff --git a/setjmp/longjmp.c b/setjmp/longjmp.c index 2453c2c124..e144a874d7 100644 --- a/setjmp/longjmp.c +++ b/setjmp/longjmp.c @@ -16,7 +16,7 @@ . */ #include -#include +#include #include @@ -31,7 +31,8 @@ __libc_siglongjmp (sigjmp_buf env, int val) if (env[0].__mask_was_saved) /* Restore the saved signal mask. */ - (void) __sigprocmask (SIG_SETMASK, &env[0].__saved_mask, + (void) __sigprocmask (SIG_SETMASK, + (sigset_t *) &env[0].__saved_mask, (sigset_t *) NULL); /* Call the machine-dependent function to restore machine state. */ diff --git a/setjmp/setjmpP.h b/setjmp/setjmpP.h new file mode 100644 index 0000000000..e65d72b654 --- /dev/null +++ b/setjmp/setjmpP.h @@ -0,0 +1,32 @@ +/* Internal __sigset_t type used in struct __jmp_buf_tag. + Copyright (C) 2017 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 + . */ + +/* + * ISO C99 Standard: 7.13 Nonlocal jumps + */ + +#ifndef _SETJMPP_H +#define _SETJMPP_H 1 + +#include <__jmpbuf_arch_t.h> +#undef __sigset_t +#define __sigset_t __jmpbuf_arch_t +#include +#include <__saved_mask.h> + +#endif /* setjmpP.h */ diff --git a/setjmp/sigjmp.c b/setjmp/sigjmp.c index 30839ae819..32b727fae8 100644 --- a/setjmp/sigjmp.c +++ b/setjmp/sigjmp.c @@ -16,7 +16,7 @@ . */ #include -#include +#include #include /* This function is called by the `sigsetjmp' macro @@ -28,7 +28,7 @@ __sigjmp_save (sigjmp_buf env, int savemask) { env[0].__mask_was_saved = (savemask && __sigprocmask (SIG_BLOCK, (sigset_t *) NULL, - &env[0].__saved_mask) == 0); + (sigset_t *) &env[0].__saved_mask) == 0); return 0; } diff --git a/setjmp/tst-sigsetjmp2.c b/setjmp/tst-sigsetjmp2.c new file mode 100644 index 0000000000..1c5adebf0b --- /dev/null +++ b/setjmp/tst-sigsetjmp2.c @@ -0,0 +1,56 @@ +/* Test that sigprocmask does not read from the unused part of jmpbuf. + Copyright (C) 2017 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 +#include +#include +#include +#include +#include <__jmpbuf_arch_t.h> +#include + +#define SIZEOF_SIGSET_T sizeof (__jmp_buf_sigset_t) + +static int +do_test (void) +{ + sigjmp_buf sj; + struct support_next_to_fault sigset_t_buf + = support_next_to_fault_allocate (SIZEOF_SIGSET_T); + sigset_t *m_p = (sigset_t *) sigset_t_buf.buffer; + sigset_t m; + + sigemptyset (&m); + memcpy (m_p, &m, SIZEOF_SIGSET_T); + sigprocmask (SIG_SETMASK, m_p, NULL); + memcpy (&m, m_p, SIZEOF_SIGSET_T); + if (sigsetjmp (sj, 0) == 0) + { + sigaddset (&m, SIGUSR1); + memcpy (m_p, &m, SIZEOF_SIGSET_T); + sigprocmask (SIG_SETMASK, m_p, NULL); + memcpy (&m, m_p, SIZEOF_SIGSET_T); + siglongjmp (sj, 1); + return EXIT_FAILURE; + } + sigprocmask (SIG_SETMASK, NULL, m_p); + memcpy (&m, m_p, SIZEOF_SIGSET_T); + return sigismember (&m, SIGUSR1) ? EXIT_SUCCESS : EXIT_FAILURE; +} + +#include diff --git a/sysdeps/generic/__jmpbuf_arch_t.h b/sysdeps/generic/__jmpbuf_arch_t.h new file mode 100644 index 0000000000..b663202a82 --- /dev/null +++ b/sysdeps/generic/__jmpbuf_arch_t.h @@ -0,0 +1,24 @@ +/* Generic __jmpbuf_arch_t defition. + Copyright (C) 2017 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 + +typedef struct + { + __sigset_t __saved_mask; + } __jmpbuf_arch_t; diff --git a/sysdeps/generic/__saved_mask.h b/sysdeps/generic/__saved_mask.h new file mode 100644 index 0000000000..5a59d5f385 --- /dev/null +++ b/sysdeps/generic/__saved_mask.h @@ -0,0 +1,20 @@ +/* Generic __saved_mask defition. + Copyright (C) 2017 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 + . */ + +/* Saved signal mask. */ +#define __saved_mask __saved_mask.__saved_mask diff --git a/sysdeps/unix/sysv/linux/__jmpbuf_arch_t.h b/sysdeps/unix/sysv/linux/__jmpbuf_arch_t.h new file mode 100644 index 0000000000..e2372e898b --- /dev/null +++ b/sysdeps/unix/sysv/linux/__jmpbuf_arch_t.h @@ -0,0 +1,43 @@ +/* __jmpbuf_arch_t defition for Linux. + Copyright (C) 2017 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 + +/* The biggest signal number + 1. As of kernel 4.13, the maximum number + of signals is 128 on MIPS. Define it to 257 to leave some rooms for + the future. */ +#define _JUMP_BUF_SIGSET_NSIG 257 +/* Number of longs to hold all signals. */ +#define _JUMP_BUF_SIGSET_NWORDS \ + ((_JUMP_BUF_SIGSET_NSIG - 1 + 7) / (8 * sizeof (unsigned long int))) + +typedef struct + { + unsigned long int __val[_JUMP_BUF_SIGSET_NWORDS]; + } __jmp_buf_sigset_t; + +typedef union + { + __sigset_t __saved_mask_compat; + struct + { + __jmp_buf_sigset_t __saved_mask; + /* Paddings for architecture specific usage. */ + unsigned long int __padding[12]; + } __saved; + } __jmpbuf_arch_t; diff --git a/sysdeps/unix/sysv/linux/__saved_mask.h b/sysdeps/unix/sysv/linux/__saved_mask.h new file mode 100644 index 0000000000..aad8871999 --- /dev/null +++ b/sysdeps/unix/sysv/linux/__saved_mask.h @@ -0,0 +1,34 @@ +/* __saved_mask defition for Linux. + Copyright (C) 2017 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 + . */ + +/* Saved signal mask. */ +#define __saved_mask __saved_mask.__saved.__saved_mask + +#include + +#define _SIGPROCMASK_NSIG_WORDS (_NSIG / (8 * sizeof (unsigned long int))) + +typedef struct + { + unsigned long int __val[_SIGPROCMASK_NSIG_WORDS]; + } __sigprocmask_sigset_t; + +extern jmp_buf ___buf; +extern __typeof (___buf[0].__saved_mask) ___saved_mask; +_Static_assert (sizeof (___saved_mask) >= sizeof (__sigprocmask_sigset_t), + "size of ___saved_mask < size of __sigprocmask_sigset_t"); diff --git a/sysdeps/unix/sysv/linux/s390/longjmp_chk.c b/sysdeps/unix/sysv/linux/s390/longjmp_chk.c index 878cbd4850..5e474bb6d2 100644 --- a/sysdeps/unix/sysv/linux/s390/longjmp_chk.c +++ b/sysdeps/unix/sysv/linux/s390/longjmp_chk.c @@ -24,7 +24,7 @@ /* this is a copy from debug/longjmp_chk.c because we need an unique name for __longjmp_chk, but it is already named via a define for __libc_siglongjmp in debug/longjmp_chk.c. */ -# include +# include // XXX Should move to include/setjmp.h extern void ____longjmp_chk (__jmp_buf __env, int __val) -- 2.13.6