Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

signals/sigaltstack: Prepare to add new SS_xxx flags

Browse Source 
This patch adds SS_FLAG_BITS - the mask that splits sigaltstack
mode values and bit-flags. Since there is no bit-flags yet, the
mask is defined to 0. The flags are added by subsequent patches.
With every new flag, the mask should have the appropriate bit cleared.

This makes sure if some flag is tried on a kernel that doesn't
support it, the -EINVAL error will be returned, because such a
flag will be treated as an invalid mode rather than the bit-flag.

That way the existence of the particular features can be probed
at run-time.

This change was suggested by Andy Lutomirski:

  https://lkml.org/lkml/2016/3/6/158

Signed-off-by: Stas Sergeev <stsp@list.ru>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Amanieu d'Antras <amanieu@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vladimir Davydov <vdavydov@parallels.com>
Cc: linux-api@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1460665206-13646-3-git-send-email-stsp@list.ru
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Stas Sergeev 2016-04-14 23:20:03 +03:00 committed by Ingo Molnar
parent 0b4521e8cf
commit 407bc16ad1
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/uapi/linux/signal.h
View File

@ -7,4 +7,7 @@
#define SS_ONSTACK 1 #define SS_ONSTACK 1
#define SS_DISABLE 2 #define SS_DISABLE 2
/* mask for all SS_xxx flags */
#define SS_FLAG_BITS 0
#endif /* _UAPI_LINUX_SIGNAL_H */ #endif /* _UAPI_LINUX_SIGNAL_H */

16
kernel/signal.c
View File

@ -3104,7 +3104,8 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
if (uss) { if (uss) {
void __user *ss_sp; void __user *ss_sp;
size_t ss_size; size_t ss_size;
int ss_flags; unsigned ss_flags;
int ss_mode;
error = -EFAULT; error = -EFAULT;
if (!access_ok(VERIFY_READ, uss, sizeof(*uss))) if (!access_ok(VERIFY_READ, uss, sizeof(*uss)))
@ -3119,18 +3120,13 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
if (on_sig_stack(sp)) if (on_sig_stack(sp))
goto out; goto out;
ss_mode = ss_flags & ~SS_FLAG_BITS;
error = -EINVAL; error = -EINVAL;
/* if (ss_mode != SS_DISABLE && ss_mode != SS_ONSTACK &&
* Note - this code used to test ss_flags incorrectly: ss_mode != 0)
* old code may have been written using ss_flags==0
* to mean ss_flags==SS_ONSTACK (as this was the only
* way that worked) - this fix preserves that older
* mechanism.
*/
if (ss_flags != SS_DISABLE && ss_flags != SS_ONSTACK && ss_flags != 0)
goto out; goto out;
if (ss_flags == SS_DISABLE) { if (ss_mode == SS_DISABLE) {
ss_size = 0; ss_size = 0;
ss_sp = NULL; ss_sp = NULL;
} else { } else {