signal: Shrinking the kernel's siginfo structure
cover signal: Shrinking the kernel's siginfo structure
I am posting these patches for review in the hopes that if I have missed something someone else might catch it. If no issues turn up I intend to merge these patches through my siginfo branch.
This set of patches make a few small ABI changes to areas of the linux ABI where as far as I can determine no one cares.
- sigqueueinfo in all it's variants now fails if si_signo != sig instead of quietly changing si_signo.
The deep issue is that the change happens after the code has already verified in copy_siginfom_from_user that the si_signo and si_code combination is meaningful.
- copy_siginfo_from_user now fails if the trailing bytes of siginfo are not 0, when the signal number and si_code combination is not recognized.
If the si_signo and si_code combination is recognized we know any trailing bytes are meaningless as the meaningful bytes are in siginfo.
This check is to allow people to define new siginfo union members and that will fail on older kernels. The check makes it as safe as possible to have a kernel_siginfo that is smaller than the ABI defined siginfo that the kernel reads from and writes to userspace.
The net effect of this change is a kernel that only uses 48 bytes for siginfo internally when the ABI defines siginfo to be 128 bytes.
The first EMT_TAGOVF change is not necesssary to strinking siginfo.
Eric W. Biederman (6):
signal/sparc: Move EMT_TAGOVF into the generic siginfo.h
signal: Fail sigqueueinfo if si_signo != sig
signal: Remove the need for __ARCH_SI_PREABLE_SIZE and SI_PAD_SIZE
signal: Introduce copy_siginfo_from_user and use it's return value
signal: Distinguish between kernel_siginfo and siginfo
signal: Use a smaller struct siginfo in the kernel
arch/alpha/include/uapi/asm/siginfo.h | 1 - arch/arm64/include/uapi/asm/Kbuild | 1 + arch/arm64/include/uapi/asm/siginfo.h | 24 --- arch/ia64/include/uapi/asm/siginfo.h | 2 - arch/mips/include/uapi/asm/siginfo.h | 11 -- arch/parisc/include/uapi/asm/Kbuild | 1 + arch/parisc/include/uapi/asm/siginfo.h | 11 -- arch/powerpc/include/uapi/asm/Kbuild | 1 + arch/powerpc/include/uapi/asm/siginfo.h | 18 --- arch/riscv/include/uapi/asm/Kbuild | 1 + arch/riscv/include/uapi/asm/siginfo.h | 24 --- arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/siginfo.h | 17 --- arch/sparc/include/uapi/asm/siginfo.h | 7 - arch/x86/include/asm/compat.h | 2 +- arch/x86/include/uapi/asm/siginfo.h | 2 - drivers/usb/core/devio.c | 4 +- fs/binfmt_elf.c | 6 +- fs/coredump.c | 2 +- fs/fcntl.c | 2 +- fs/signalfd.c | 6 +- include/linux/binfmts.h | 2 +- include/linux/compat.h | 4 +- include/linux/coredump.h | 4 +- include/linux/lsm_hooks.h | 4 +- include/linux/posix-timers.h | 2 +- include/linux/ptrace.h | 2 +- include/linux/sched.h | 2 +- include/linux/sched/signal.h | 18 +-- include/linux/security.h | 6 +- include/linux/signal.h | 16 +- include/linux/signal_types.h | 8 +- include/trace/events/signal.h | 4 +- include/uapi/asm-generic/siginfo.h | 193 ++++++++++++----------- ipc/mqueue.c | 2 +- kernel/ptrace.c | 22 ++- kernel/seccomp.c | 6 +- kernel/signal.c | 263 ++++++++++++++++++++++---------- kernel/time/posix-timers.c | 2 +- security/apparmor/lsm.c | 2 +- security/security.c | 2 +- security/selinux/hooks.c | 2 +- security/smack/smack_lsm.c | 2 +- 43 files changed, 356 insertions(+), 356 deletions(-)
Eric
PATCH 1/6 signal/sparc: Move EMT_TAGOVF into the generic siginfo.h
When moving all of the architectures specific si_codes into siginfo.h, I apparently overlooked EMT_TAGOVF. Move it now.
Remove the now redundant test in siginfo_layout for SIGEMT as now NSIGEMT is always defined.
--- arch/sparc/include/uapi/asm/siginfo.h | 6 ------ include/uapi/asm-generic/siginfo.h | 6 ++++++ kernel/signal.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
arch/sparc/include/uapi/asm/siginfo.h +0 -6
@@ -17,10 +17,4 @@#define SI_NOINFO 32767/* no information in siginfo_t */ -/* -* SIGEMT si_codes -*/ -#define EMT_TAGOVF 1/* tag overflow */ -#define NSIGEMT 1 -#endif /* _UAPI__SPARC_SIGINFO_H */
include/uapi/asm-generic/siginfo.h +6 -0
@@ -285,6 +285,12 @@ typedef struct siginfo {#define SYS_SECCOMP 1/* seccomp triggered */ #define NSIGSYS 1 +/* +* SIGEMT si_codes +*/ +#define EMT_TAGOVF 1/* tag overflow */ +#define NSIGEMT 1 +/* * sigevent definitions *
kernel/signal.c +1 -1
@@ -2856,7 +2856,7 @@ enum siginfo_layout siginfo_layout(int sig, int si_code) [SIGSEGV] = { NSIGSEGV, SIL_FAULT }, [SIGBUS] = { NSIGBUS, SIL_FAULT }, [SIGTRAP] = { NSIGTRAP, SIL_FAULT }, -#if defined(SIGEMT) && defined(NSIGEMT) +#if defined(SIGEMT) [SIGEMT] = { NSIGEMT, SIL_FAULT }, #endif [SIGCHLD] = { NSIGCHLD, SIL_CHLD },
Signature · 1 line
2.17.1
PATCH 2/6 signal: Fail sigqueueinfo if si_signo != sig
In reply to Eric W. BiedermanThe kernel needs to validate that the contents of struct siginfo make sense as siginfo is copied into the kernel, so that the proper union members can be put in the appropriate locations. The field si_signo is a fundamental part of that validation. As such changing the contents of si_signo after the validation make no sense and can result in nonsense values in the kernel.
As such simply fail if someone is silly enough to set si_signo out of sync with the signal number passed to sigqueueinfo.
I don't expect a problem as glibc's sigqueue implementation sets "si_signo = sig" and CRIU just returns to the kernel what the kernel gave to it.
If there is some application that calls sigqueueinfo directly that has a problem with this added sanity check we can revisit this when we see what kind of crazy that application is doing.
--- kernel/signal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/signal.c +4 -2
@@ -3306,7 +3306,8 @@ static int do_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t *info) (task_pid_vnr(current) != pid))return -EPERM ; - info->si_signo = sig; +if (info->si_signo != sig) +return -EINVAL ;/* POSIX.1b doesn't mention process groups. */ return kill_proc_info (sig, info, pid);
@@ -3354,7 +3355,8 @@ static int do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, siginfo_t *info) (task_pid_vnr(current) != pid))return -EPERM ; - info->si_signo = sig; +if (info->si_signo != sig) +return -EINVAL ;return do_send_specific (tgid, pid, sig, info); }
Signature · 1 line
2.17.1
Re: [REVIEW][PATCH 2/6] signal: Fail sigqueueinfo if si_signo != sig
Quoted 6 lines · Eric W. Biederman
The kernel needs to validate that the contents of struct siginfo make sense as siginfo is copied into the kernel, so that the proper union members can be put in the appropriate locations. The field
si_signois a fundamental part of that validation. As such changing the contents ofsi_signoafter the validation make no sense and can result in nonsense values in the kernel.
Accoding to the man page, the user should not set si_signo, it has to be set by kernel.
$ man 2 rt_sigqueueinfo
The uinfo argument specifies the data to accompany the signal. This
argument is a pointer to a structure of type siginfo_t, described in
sigaction(2) (and defined by including <sigaction.h>). The caller
should set the following fields in this structure:
si_code
This must be one of the SI_* codes in the Linux kernel source file include/asm-generic/siginfo.h, with the restriction that the code must be negative (i.e., cannot be SI_USER, which is used by the kernel to indicate a signal sent by kill(2)) and cannot (since Linux 2.6.39) be SI_TKILL (which is used by the kernel to indicate a signal sent using tgkill(2)).
si_pid This should be set to a process ID, typically the process ID of
the sender.
si_uid This should be set to a user ID, typically the real user ID of
the sender.
si_value
This field contains the user data to accompany the signal. For
more information, see the description of the last (union sigval) argument of sigqueue(3).
Internally, the kernel sets the si_signo field to the value specified in sig, so that the receiver of the signal can also obtain the signal number via that field.
Quoted 11 lines
As such simply fail if someone is silly enough to set
si_signoout of sync with the signal number passed to sigqueueinfo.I don't expect a problem as glibc's sigqueue implementation sets "
si_signo= sig" and CRIU just returns to the kernel what the kernel gave to it.If there is some application that calls sigqueueinfo directly that has a problem with this added sanity check we can revisit this when we see what kind of crazy that application is doing.
I already know two "applications" ;)
https://github.com/torvalds/linux/blob/master/tools/testing/selftests/ptrace/peeksiginfo.c
https://github.com/checkpoint-restore/criu/blob/master/test/zdtm/static/sigpending.c
Disclaimer: I'm the author of both of them.
Quoted 30 lines
Signed-off-by "Eric W. Biederman" <[email protected]>--- kernel/signal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)kernel/signal.c +4
-2@@ -3306,7 +3306,8 @@ static int do_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t *info) (task_pid_vnr(current) != pid))return -EPERM ; - info->si_signo = sig; +if (info->si_signo != sig) +return -EINVAL ;/* POSIX.1b doesn't mention process groups. */ return kill_proc_info (sig, info, pid);@@ -3354,7 +3355,8 @@ static int do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, siginfo_t *info) (task_pid_vnr(current) != pid))return -EPERM ; - info->si_signo = sig; +if (info->si_signo != sig) +return -EINVAL ;return do_send_specific (tgid, pid, sig, info); }
Re: [REVIEW][PATCH 2/6] signal: Fail sigqueueinfo if si_signo != sig
Quoted 54 lines · Andrei Vagin
Quoted 6 lines · Eric W. Biederman
The kernel needs to validate that the contents of struct siginfo make sense as siginfo is copied into the kernel, so that the proper union members can be put in the appropriate locations. The field
si_signois a fundamental part of that validation. As such changing the contents ofsi_signoafter the validation make no sense and can result in nonsense values in the kernel.Accoding to the man page, the user should not set
si_signo, it has to be set by kernel.$ man 2 rt_sigqueueinfoThe uinfo argument specifies the data to accompany the signal. This
argument is a pointer to a structure of typesiginfo_t, described in
sigaction(2) (and defined by including <sigaction.h>). The caller
should set the following fields in this structure:
si_code
This must be one of the SI_* codes in the Linux kernel source fileinclude/asm-generic/siginfo.h, with the restriction that the code must be negative (i.e., cannot beSI_USER, which is used by the kernel to indicate a signal sent by kill(2)) and cannot (since Linux 2.6.39) beSI_TKILL(which is used by the kernel to indicate a signal sent using tgkill(2)).
si_pidThis should be set to a process ID, typically the process ID of
the sender.
si_uidThis should be set to a user ID, typically the real user ID of
the sender.
si_value
This field contains the user data to accompany the signal. For
more information, see the description of the last (union sigval) argument of sigqueue(3).Internally, the kernel sets the
si_signofield to the value specified in sig, so that the receiver of the signal can also obtain the signal number via that field.Quoted 11 lines
As such simply fail if someone is silly enough to set
si_signoout of sync with the signal number passed to sigqueueinfo.I don't expect a problem as glibc's sigqueue implementation sets "
si_signo= sig" and CRIU just returns to the kernel what the kernel gave to it.If there is some application that calls sigqueueinfo directly that has a problem with this added sanity check we can revisit this when we see what kind of crazy that application is doing.
Quoted 6 lines
I already know two "applications" ;)
https://github.com/torvalds/linux/blob/master/tools/testing/selftests/ptrace/peeksiginfo.c
https://github.com/checkpoint-restore/criu/blob/master/test/zdtm/static/sigpending.cDisclaimer: I'm the author of both of them.
Fair enough. Then this counts as a regression. The setting in the kernel happens in an awkward place and I will see if it can be moved earlier.
Eric
Quoted 29 lines
Quoted 29 lines
Signed-off-by "Eric W. Biederman" <[email protected]>--- kernel/signal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)kernel/signal.c +4
-2@@ -3306,7 +3306,8 @@ static int do_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t *info) (task_pid_vnr(current) != pid))return -EPERM ; - info->si_signo = sig; +if (info->si_signo != sig) +return -EINVAL ;/* POSIX.1b doesn't mention process groups. */ return kill_proc_info (sig, info, pid);@@ -3354,7 +3355,8 @@ static int do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, siginfo_t *info) (task_pid_vnr(current) != pid))return -EPERM ; - info->si_signo = sig; +if (info->si_signo != sig) +return -EINVAL ;return do_send_specific (tgid, pid, sig, info); }
Re: [REVIEW][PATCH 2/6] signal: Fail sigqueueinfo if si_signo != sig
In reply to Andrei VaginQuoted 10 lines · Andrei Vagin
Quoted 6 lines · Eric W. Biederman
The kernel needs to validate that the contents of struct siginfo make sense as siginfo is copied into the kernel, so that the proper union members can be put in the appropriate locations. The field
si_signois a fundamental part of that validation. As such changing the contents ofsi_signoafter the validation make no sense and can result in nonsense values in the kernel.Accoding to the man page, the user should not set
si_signo, it has to be set by kernel.
I wanted to say look at copy_siginfo_from_user32 it uses si_signo and it has always done so. But before I got to fixing copy_siginfo_from_user32 only looked at si_code. This is one of the areas where we deliberately slightly changed the KABI. To start looking an signo instead of magic kernel internal si_code values.
So yes. Looking at si_signo instead of the passed in signo appears to be a regression all of the way around (except for ptrace) where that value is not present. So I will see if I can figure out how to refactor the code to accomplish that.
I am travelling for the next couple of days so I won't be able to get to this for a bit.
I am thinking I will need two version of copy_siginfo_from user now. One for ptrace and one for rt_sgiqueueinfo. Sigh.
Quoted 80 lines
$ man 2 rt_sigqueueinfoThe uinfo argument specifies the data to accompany the signal. This
argument is a pointer to a structure of typesiginfo_t, described in
sigaction(2) (and defined by including <sigaction.h>). The caller
should set the following fields in this structure:
si_code
This must be one of the SI_* codes in the Linux kernel source fileinclude/asm-generic/siginfo.h, with the restriction that the code must be negative (i.e., cannot beSI_USER, which is used by the kernel to indicate a signal sent by kill(2)) and cannot (since Linux 2.6.39) beSI_TKILL(which is used by the kernel to indicate a signal sent using tgkill(2)).
si_pidThis should be set to a process ID, typically the process ID of
the sender.
si_uidThis should be set to a user ID, typically the real user ID of
the sender.
si_value
This field contains the user data to accompany the signal. For
more information, see the description of the last (union sigval) argument of sigqueue(3).Internally, the kernel sets the
si_signofield to the value specified in sig, so that the receiver of the signal can also obtain the signal number via that field.Quoted 11 lines
As such simply fail if someone is silly enough to set
si_signoout of sync with the signal number passed to sigqueueinfo.I don't expect a problem as glibc's sigqueue implementation sets "
si_signo= sig" and CRIU just returns to the kernel what the kernel gave to it.If there is some application that calls sigqueueinfo directly that has a problem with this added sanity check we can revisit this when we see what kind of crazy that application is doing.
I already know two "applications" ;)
https://github.com/torvalds/linux/blob/master/tools/testing/selftests/ptrace/peeksiginfo.c
https://github.com/checkpoint-restore/criu/blob/master/test/zdtm/static/sigpending.cDisclaimer: I'm the author of both of them.
Quoted 30 lines
Signed-off-by "Eric W. Biederman" <[email protected]>--- kernel/signal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)kernel/signal.c +4
-2@@ -3306,7 +3306,8 @@ static int do_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t *info) (task_pid_vnr(current) != pid))return -EPERM ; - info->si_signo = sig; +if (info->si_signo != sig) +return -EINVAL ;/* POSIX.1b doesn't mention process groups. */ return kill_proc_info (sig, info, pid);@@ -3354,7 +3355,8 @@ static int do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, siginfo_t *info) (task_pid_vnr(current) != pid))return -EPERM ; - info->si_signo = sig; +if (info->si_signo != sig) +return -EINVAL ;return do_send_specific (tgid, pid, sig, info); }
[REVIEW][PATCH 7/6] signal: In sigqueueinfo prefer sig not si_signo
In reply to Andrei VaginAndrei Vagin <[email protected]> reported:
Quoted 40 lines
Accoding to the man page, the user should not set
si_signo, it has to be set by kernel.$ man 2 rt_sigqueueinfoThe uinfo argument specifies the data to accompany the signal. This
argument is a pointer to a structure of typesiginfo_t, described in
sigaction(2) (and defined by including <sigaction.h>). The caller
should set the following fields in this structure:
si_code
This must be one of the SI_* codes in the Linux kernel source fileinclude/asm-generic/siginfo.h, with the restriction that the code must be negative (i.e., cannot beSI_USER, which is used by the kernel to indicate a signal sent by kill(2)) and cannot (since Linux 2.6.39) beSI_TKILL(which is used by the kernel to indicate a signal sent using tgkill(2)).
si_pidThis should be set to a process ID, typically the process ID of
the sender.
si_uidThis should be set to a user ID, typically the real user ID of
the sender.
si_value
This field contains the user data to accompany the signal. For
more information, see the description of the last (union sigval) argument of sigqueue(3).Internally, the kernel sets the
si_signofield to the value specified in sig, so that the receiver of the signal can also obtain the signal number via that field.Quoted 4 lines · Eric W. Biederman
If there is some application that calls sigqueueinfo directly that has a problem with this added sanity check we can revisit this when we see what kind of crazy that application is doing.
Quoted 6 lines
I already know two "applications" ;)
https://github.com/torvalds/linux/blob/master/tools/testing/selftests/ptrace/peeksiginfo.c
https://github.com/checkpoint-restore/criu/blob/master/test/zdtm/static/sigpending.cDisclaimer: I'm the author of both of them.
Looking at the kernel code the historical behavior has alwasy been to prefer the signal number passed in by the kernel.
So sigh. Implmenet __copy_siginfo_from_user and __copy_siginfo_from_user32 to take that signal number and prefer it. The user of ptrace will still use copy_siginfo_from_user and copy_siginfo_from_user32 as they do not and never have had a signal number there.
Luckily this change has never made it farther than linux-next.
---
Andrei can you verify this fixes your programs?
Thank you very much,
Eric
kernel/signal.c | 141 ++++++++++++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 57 deletions(-)
kernel/signal.c +84 -57
@@ -2925,11 +2925,10 @@ int copy_siginfo_to_user(siginfo_t __user *to, const kernel_siginfo_t *from)return 0 ; } -int copy_siginfo_from_user (kernel_siginfo_t *to,const siginfo_t __user *from) +static int post_copy_siginfo_from_user (kernel_siginfo_t *info, +const siginfo_t __user *from) { -if (copy_from_user (to, from,sizeof (struct kernel_siginfo ))) -return -EFAULT ; -if (unlikely (!known_siginfo_layout (to->si_signo, to->si_code))) { +if (unlikely (!known_siginfo_layout (info->si_signo, info->si_code))) {char __user *expansion =si_expansion (from);char buf[SI_EXPANSION_SIZE ];int i;
@@ -2949,6 +2948,22 @@ int copy_siginfo_from_user(kernel_siginfo_t *to, const siginfo_t __user *from)return 0 ; } +static int __copy_siginfo_from_user (int signo,kernel_siginfo_t *to, +const siginfo_t __user *from) +{ +if (copy_from_user (to, from,sizeof (struct kernel_siginfo ))) +return -EFAULT ; + to->si_signo = signo; +return post_copy_siginfo_from_user (to, from); +} + +int copy_siginfo_from_user (kernel_siginfo_t *to,const siginfo_t __user *from) +{ +if (copy_from_user (to, from,sizeof (struct kernel_siginfo ))) +return -EFAULT ; +return post_copy_siginfo_from_user (to, from); +} +#ifdef CONFIG_COMPAT int copy_siginfo_to_user32 (struct compat_siginfo __user *to,const struct kernel_siginfo *from)
@@ -3041,88 +3056,106 @@ int __copy_siginfo_to_user32(struct compat_siginfo __user *to,return 0 ; } -int copy_siginfo_from_user32 (struct kernel_siginfo *to, -const struct compat_siginfo __user *ufrom) +static int post_copy_siginfo_from_user32 (kernel_siginfo_t *to, +const struct compat_siginfo *from) { -struct compat_siginfo from; - -if (copy_from_user (&from, ufrom,sizeof (struct compat_siginfo ))) -return -EFAULT ; -clear_siginfo (to); - to->si_signo = from.si_signo; - to->si_errno = from.si_errno; - to->si_code = from.si_code; -switch (siginfo_layout (from.si_signo, from.si_code)) { + to->si_signo = from->si_signo; + to->si_errno = from->si_errno; + to->si_code = from->si_code; +switch (siginfo_layout (from->si_signo, from->si_code)) {case SIL_KILL : - to->si_pid = from.si_pid; - to->si_uid = from.si_uid; + to->si_pid = from->si_pid; + to->si_uid = from->si_uid;break ;case SIL_TIMER : - to->si_tid = from.si_tid; - to->si_overrun = from.si_overrun; - to->si_int = from.si_int; + to->si_tid = from->si_tid; + to->si_overrun = from->si_overrun; + to->si_int = from->si_int;break ;case SIL_POLL : - to->si_band = from.si_band; - to->si_fd = from.si_fd; + to->si_band = from->si_band; + to->si_fd = from->si_fd;break ;case SIL_FAULT : - to->si_addr =compat_ptr (from.si_addr); + to->si_addr =compat_ptr (from->si_addr);#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from.si_trapno; + to->si_trapno = from->si_trapno;#endif break ;case SIL_FAULT_MCEERR : - to->si_addr =compat_ptr (from.si_addr); + to->si_addr =compat_ptr (from->si_addr);#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from.si_trapno; + to->si_trapno = from->si_trapno;#endif - to->si_addr_lsb = from.si_addr_lsb; + to->si_addr_lsb = from->si_addr_lsb;break ;case SIL_FAULT_BNDERR : - to->si_addr =compat_ptr (from.si_addr); + to->si_addr =compat_ptr (from->si_addr);#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from.si_trapno; + to->si_trapno = from->si_trapno;#endif - to->si_lower =compat_ptr (from.si_lower); - to->si_upper =compat_ptr (from.si_upper); + to->si_lower =compat_ptr (from->si_lower); + to->si_upper =compat_ptr (from->si_upper);break ;case SIL_FAULT_PKUERR : - to->si_addr =compat_ptr (from.si_addr); + to->si_addr =compat_ptr (from->si_addr);#ifdef __ARCH_SI_TRAPNO - to->si_trapno = from.si_trapno; + to->si_trapno = from->si_trapno;#endif - to->si_pkey = from.si_pkey; + to->si_pkey = from->si_pkey;break ;case SIL_CHLD : - to->si_pid = from.si_pid; - to->si_uid = from.si_uid; - to->si_status = from.si_status; + to->si_pid = from->si_pid; + to->si_uid = from->si_uid; + to->si_status = from->si_status;#ifdef CONFIG_X86_X32_ABI if (in_x32_syscall ()) { - to->si_utime = from._sifields._sigchld_x32._utime; - to->si_stime = from._sifields._sigchld_x32._stime; + to->si_utime = from->_sifields._sigchld_x32._utime; + to->si_stime = from->_sifields._sigchld_x32._stime; } else#endif { - to->si_utime = from.si_utime; - to->si_stime = from.si_stime; + to->si_utime = from->si_utime; + to->si_stime = from->si_stime; }break ;case SIL_RT : - to->si_pid = from.si_pid; - to->si_uid = from.si_uid; - to->si_int = from.si_int; + to->si_pid = from->si_pid; + to->si_uid = from->si_uid; + to->si_int = from->si_int;break ;case SIL_SYS : - to->si_call_addr =compat_ptr (from.si_call_addr); - to->si_syscall = from.si_syscall; - to->si_arch = from.si_arch; + to->si_call_addr =compat_ptr (from->si_call_addr); + to->si_syscall = from->si_syscall; + to->si_arch = from->si_arch;break ; }return 0 ; } + +static int __copy_siginfo_from_user32 (int signo,struct kernel_siginfo *to, +const struct compat_siginfo __user *ufrom) +{ +struct compat_siginfo from; + +if (copy_from_user (&from, ufrom,sizeof (struct compat_siginfo ))) +return -EFAULT ; + + from.si_signo = signo; +return post_copy_siginfo_from_user32 (to, &from); +} + +int copy_siginfo_from_user32 (struct kernel_siginfo *to, +const struct compat_siginfo __user *ufrom) +{ +struct compat_siginfo from; + +if (copy_from_user (&from, ufrom,sizeof (struct compat_siginfo ))) +return -EFAULT ; + +return post_copy_siginfo_from_user32 (to, &from); +}#endif /* CONFIG_COMPAT */ /**
@@ -3359,9 +3392,6 @@ static int do_rt_sigqueueinfo(pid_t pid, int sig, kernel_siginfo_t *info) (task_pid_vnr(current) != pid))return -EPERM ; -if (info->si_signo != sig) -return -EINVAL ; -/* POSIX.1b doesn't mention process groups. */ return kill_proc_info (sig, info, pid); }
@@ -3376,7 +3406,7 @@ SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, pid, int, sig, siginfo_t __user *, uinfo) {kernel_siginfo_t info; -int ret =copy_siginfo_from_user (&info, uinfo); +int ret =__copy_siginfo_from_user (sig, &info, uinfo);if (unlikely (ret))return ret;return do_rt_sigqueueinfo (pid, sig, &info);
@@ -3389,7 +3419,7 @@ COMPAT_SYSCALL_DEFINE3(rt_sigqueueinfo, struct compat_siginfo __user *, uinfo) {kernel_siginfo_t info; -int ret =copy_siginfo_from_user32 (&info, uinfo); +int ret =__copy_siginfo_from_user32 (sig, &info, uinfo);if (unlikely (ret))return ret;return do_rt_sigqueueinfo (pid, sig, &info);
@@ -3409,9 +3439,6 @@ static int do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, kernel_siginfo_t (task_pid_vnr(current) != pid))return -EPERM ; -if (info->si_signo != sig) -return -EINVAL ; -return do_send_specific (tgid, pid, sig, info); }
@@ -3419,7 +3446,7 @@ SYSCALL_DEFINE4(rt_tgsigqueueinfo, pid_t, tgid, pid_t, pid, int, sig, siginfo_t __user *, uinfo) {kernel_siginfo_t info; -int ret =copy_siginfo_from_user (&info, uinfo); +int ret =__copy_siginfo_from_user (sig, &info, uinfo);if (unlikely (ret))return ret;return do_rt_tgsigqueueinfo (tgid, pid, sig, &info);
@@ -3433,7 +3460,7 @@ COMPAT_SYSCALL_DEFINE4(rt_tgsigqueueinfo, struct compat_siginfo __user *, uinfo) {kernel_siginfo_t info; -int ret =copy_siginfo_from_user32 (&info, uinfo); +int ret =__copy_siginfo_from_user32 (sig, &info, uinfo);if (unlikely (ret))return ret;return do_rt_tgsigqueueinfo (tgid, pid, sig, &info);
PATCH 3/6 signal: Remove the need for __ARCH_SI_PREABLE_SIZE and SI_PAD_SIZE
In reply to Eric W. BiedermanRework the defintion of struct siginfo so that the array padding struct siginfo to SI_MAX_SIZE can be placed in a union along side of the rest of the struct siginfo members. The result is that we no longer need the __ARCH_SI_PREAMBLE_SIZE or SI_PAD_SIZE definitions.
--- arch/alpha/include/uapi/asm/siginfo.h | 1 - arch/arm64/include/uapi/asm/Kbuild | 1 + arch/arm64/include/uapi/asm/siginfo.h | 24 --- arch/ia64/include/uapi/asm/siginfo.h | 2 - arch/mips/include/uapi/asm/siginfo.h | 11 -- arch/parisc/include/uapi/asm/Kbuild | 1 + arch/parisc/include/uapi/asm/siginfo.h | 11 -- arch/powerpc/include/uapi/asm/Kbuild | 1 + arch/powerpc/include/uapi/asm/siginfo.h | 18 --- arch/riscv/include/uapi/asm/Kbuild | 1 + arch/riscv/include/uapi/asm/siginfo.h | 24 --- arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/siginfo.h | 17 --- arch/sparc/include/uapi/asm/siginfo.h | 1 - arch/x86/include/uapi/asm/siginfo.h | 2 - include/uapi/asm-generic/siginfo.h | 187 ++++++++++++------------ kernel/signal.c | 3 - 17 files changed, 99 insertions(+), 207 deletions(-) delete mode 100644 arch/arm64/include/uapi/asm/siginfo.h delete mode 100644 arch/parisc/include/uapi/asm/siginfo.h delete mode 100644 arch/powerpc/include/uapi/asm/siginfo.h delete mode 100644 arch/riscv/include/uapi/asm/siginfo.h delete mode 100644 arch/s390/include/uapi/asm/siginfo.h
arch/alpha/include/uapi/asm/siginfo.h +0 -1
@@ -2,7 +2,6 @@#ifndef _ALPHA_SIGINFO_H#define _ALPHA_SIGINFO_H -#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))#define __ARCH_SI_TRAPNO#include <asm-generic/siginfo.h>
arch/arm64/include/uapi/asm/Kbuild +1 -0
@@ -19,3 +19,4 @@ generic-y += swab.h generic-y += termbits.h generic-y += termios.h generic-y += types.h +generic-y += siginfo.h
arch/arm64/include/uapi/asm/siginfo.h deleted +0 -24
@@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* -* Copyright (C) 2012 ARM Ltd. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#ifndef __ASM_SIGINFO_H -#define __ASM_SIGINFO_H - -#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) - -#include <asm-generic/siginfo.h> - -#endif
arch/ia64/include/uapi/asm/siginfo.h +0 -2
@@ -9,8 +9,6 @@#define _UAPI_ASM_IA64_SIGINFO_H -#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) -#include <asm-generic/siginfo.h> #define si_imm _sifields._sigfault._imm/* as per UNIX SysV ABI spec */
arch/mips/include/uapi/asm/siginfo.h +0 -11
@@ -14,17 +14,6 @@#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))#undef __ARCH_SI_TRAPNO/* exception code needs to fill this ... */ -/* -* Careful to keep union _sifields from shifting ... -*/ -#if _MIPS_SZLONG ==32 -#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int)) -#elif _MIPS_SZLONG ==64 -#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) -#else -#error _MIPS_SZLONG neither 32 nor 64 -#endif -#define __ARCH_HAS_SWAPPED_SIGINFO#include <asm-generic/siginfo.h>
arch/parisc/include/uapi/asm/Kbuild +1 -0
@@ -7,3 +7,4 @@ generic-y += kvm_para.h generic-y += param.h generic-y += poll.h generic-y += resource.h +generic-y += siginfo.h
arch/parisc/include/uapi/asm/siginfo.h deleted +0 -11
@@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _PARISC_SIGINFO_H -#define _PARISC_SIGINFO_H - -#if defined(__LP64__) -#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) -#endif - -#include <asm-generic/siginfo.h> - -#endif
arch/powerpc/include/uapi/asm/Kbuild +1 -0
@@ -7,3 +7,4 @@ generic-y += poll.h generic-y += resource.h generic-y += sockios.h generic-y += statfs.h +generic-y += siginfo.h
arch/powerpc/include/uapi/asm/siginfo.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ -#ifndef _ASM_POWERPC_SIGINFO_H -#define _ASM_POWERPC_SIGINFO_H - -/* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -*/ - -#ifdef __powerpc64__ -# define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) -#endif - -#include <asm-generic/siginfo.h> - -#endif /* _ASM_POWERPC_SIGINFO_H */
arch/riscv/include/uapi/asm/Kbuild +1 -0
@@ -26,3 +26,4 @@ generic-y += swab.h generic-y += termbits.h generic-y += termios.h generic-y += types.h +generic-y += siginfo.h
arch/riscv/include/uapi/asm/siginfo.h deleted +0 -24
@@ -1,24 +0,0 @@ -/* -* Copyright (C) 2012 ARM Ltd. -* Copyright (C) 2016 SiFive, Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#ifndef __ASM_SIGINFO_H -#define __ASM_SIGINFO_H - -#define __ARCH_SI_PREAMBLE_SIZE (__SIZEOF_POINTER__ == 4 ? 12 : 16) - -#include <asm-generic/siginfo.h> - -#endif
arch/s390/include/uapi/asm/Kbuild +1 -0
@@ -18,3 +18,4 @@ generic-y += shmbuf.h generic-y += sockios.h generic-y += swab.h generic-y += termbits.h +generic-y += siginfo.h
arch/s390/include/uapi/asm/siginfo.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* -* S390 version -* -* Derived from "include/asm-i386/siginfo.h" -*/ - -#ifndef _S390_SIGINFO_H -#define _S390_SIGINFO_H - -#ifdef __s390x__ -#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) -#endif - -#include <asm-generic/siginfo.h> - -#endif
arch/sparc/include/uapi/asm/siginfo.h +0 -1
@@ -4,7 +4,6 @@#if defined(__sparc__) && defined(__arch64__) -#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))#define __ARCH_SI_BAND_T int#endif /* defined(__sparc__) && defined(__arch64__) */
arch/x86/include/uapi/asm/siginfo.h +0 -2
@@ -7,8 +7,6 @@typedef long long __kernel_si_clock_t __attribute__((aligned (4 )));# define __ARCH_SI_CLOCK_T __kernel_si_clock_t# define __ARCH_SI_ATTRIBUTES __attribute__((aligned(8))) -# else /* x86-64 */ -# define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))# endif #endif
include/uapi/asm-generic/siginfo.h +94 -93
208 lines not on this page · raw message
kernel/signal.c +0 -3
@@ -3963,9 +3963,6 @@ __weak const char *arch_vma_name(struct vm_area_struct *vma)void __init signals_init (void ) { -/* If this check fails, the __ARCH_SI_PREAMBLE_SIZE value is wrong! */ -BUILD_BUG_ON (__ARCH_SI_PREAMBLE_SIZE - != offsetof(struct siginfo, _sifields._pad));BUILD_BUG_ON (sizeof (struct siginfo ) !=SI_MAX_SIZE ); sigqueue_cachep =KMEM_CACHE (sigqueue,SLAB_PANIC );
Signature · 1 line
2.17.1
PATCH 4/6 signal: Introduce copy_siginfo_from_user and use it's return value
In reply to Eric W. BiedermanIn preparation for using a smaller version of siginfo in the kernel introduce copy_siginfo_from_user and use it when siginfo is copied from userspace.
Make the pattern for using copy_siginfo_from_user and copy_siginfo_from_user32 to capture the return value and return that value on error.
This is a necessary prerequisite for using a smaller siginfo in the kernel than the kernel exports to userspace.
--- include/linux/signal.h | 1 + kernel/ptrace.c | 12 +++++------- kernel/signal.c | 25 ++++++++++++++++--------- 3 files changed, 22 insertions(+), 16 deletions(-)
include/linux/signal.h +1 -0
@@ -22,6 +22,7 @@ static inline void clear_siginfo(struct siginfo *info) }int copy_siginfo_to_user (struct siginfo __user *to,const struct siginfo *from); +int copy_siginfo_from_user (struct siginfo *to,const struct siginfo __user *from);enum siginfo_layout {SIL_KILL ,
kernel/ptrace.c +5 -7
@@ -919,9 +919,8 @@ int ptrace_request(struct task_struct *child, long request,break ;case PTRACE_SETSIGINFO : -if (copy_from_user (&siginfo, datavp,sizeof siginfo)) - ret = -EFAULT ; -else + ret =copy_siginfo_from_user (&siginfo, datavp); +if (!ret) ret =ptrace_setsiginfo (child, &siginfo);break ;
@@ -1215,10 +1214,9 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,break ;case PTRACE_SETSIGINFO : -if (copy_siginfo_from_user32 ( - &siginfo, (struct compat_siginfo __user *) datap)) - ret = -EFAULT ; -else + ret =copy_siginfo_from_user32 ( + &siginfo, (struct compat_siginfo __user *) datap); +if (!ret) ret =ptrace_setsiginfo (child, &siginfo);break ;#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
kernel/signal.c +16 -9
@@ -2896,6 +2896,13 @@ int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from)return 0 ; } +int copy_siginfo_from_user (siginfo_t *to,const siginfo_t __user *from) +{ +if (copy_from_user (to, from,sizeof (struct siginfo ))) +return -EFAULT ; +return 0 ; +} +#ifdef CONFIG_COMPAT int copy_siginfo_to_user32 (struct compat_siginfo __user *to,const struct siginfo *from)
@@ -3323,8 +3330,9 @@ SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, pid, int, sig, siginfo_t __user *, uinfo) {siginfo_t info; -if (copy_from_user (&info, uinfo,sizeof (siginfo_t))) -return -EFAULT ; +int ret =copy_siginfo_from_user (&info, uinfo); +if (unlikely (ret)) +return ret;return do_rt_sigqueueinfo (pid, sig, &info); }
@@ -3365,10 +3373,9 @@ SYSCALL_DEFINE4(rt_tgsigqueueinfo, pid_t, tgid, pid_t, pid, int, sig, siginfo_t __user *, uinfo) {siginfo_t info; - -if (copy_from_user (&info, uinfo,sizeof (siginfo_t))) -return -EFAULT ; - +int ret =copy_siginfo_from_user (&info, uinfo); +if (unlikely (ret)) +return ret;return do_rt_tgsigqueueinfo (tgid, pid, sig, &info); }
@@ -3380,9 +3387,9 @@ COMPAT_SYSCALL_DEFINE4(rt_tgsigqueueinfo, struct compat_siginfo __user *, uinfo) {siginfo_t info; - -if (copy_siginfo_from_user32 (&info, uinfo)) -return -EFAULT ; +int ret =copy_siginfo_from_user32 (&info, uinfo); +if (unlikely (ret)) +return ret;return do_rt_tgsigqueueinfo (tgid, pid, sig, &info); }#endif
Signature · 1 line
2.17.1
PATCH 5/6 signal: Distinguish between kernel_siginfo and siginfo
In reply to Eric W. BiedermanLinus recently observed that if we did not worry about the padding member in struct siginfo it is only about 48 bytes, and 48 bytes is much nicer than 128 bytes for allocating on the stack and copying around in the kernel.
The obvious thing of only adding the padding when userspace is including siginfo.h won't work as there are sigframe definitions in the kernel that embed struct siginfo.
So split siginfo in two; kernel_siginfo and siginfo. Keeping the traditional name for the userspace definition. While the version that is used internally to the kernel and ultimately will not be padded to 128 bytes is called kernel_siginfo.
The definition of struct kernel_siginfo I have put in include/signal_types.h
A set of buildtime checks has been added to verify the two structures have the same field offsets.
To make it easy to verify the change kernel_siginfo retains the same size as siginfo. The reduction in size comes in a following change.
--- arch/x86/include/asm/compat.h | 2 +- drivers/usb/core/devio.c | 4 +- fs/binfmt_elf.c | 6 +- fs/coredump.c | 2 +- fs/fcntl.c | 2 +- fs/signalfd.c | 6 +- include/linux/binfmts.h | 2 +- include/linux/compat.h | 4 +- include/linux/coredump.h | 4 +- include/linux/lsm_hooks.h | 4 +- include/linux/posix-timers.h | 2 +- include/linux/ptrace.h | 2 +- include/linux/sched.h | 2 +- include/linux/sched/signal.h | 18 ++-- include/linux/security.h | 6 +- include/linux/signal.h | 15 ++-- include/linux/signal_types.h | 11 ++- include/trace/events/signal.h | 4 +- ipc/mqueue.c | 2 +- kernel/ptrace.c | 10 +-- kernel/seccomp.c | 6 +- kernel/signal.c | 151 ++++++++++++++++++++++------------ kernel/time/posix-timers.c | 2 +- security/apparmor/lsm.c | 2 +- security/security.c | 2 +- security/selinux/hooks.c | 2 +- security/smack/smack_lsm.c | 2 +- 27 files changed, 165 insertions(+), 110 deletions(-)
arch/x86/include/asm/compat.h +1 -1
@@ -240,6 +240,6 @@ static inline bool in_compat_syscall(void)struct compat_siginfo ;int __copy_siginfo_to_user32 (struct compat_siginfo __user *to, -const siginfo_t *from,bool x32_ABI); +const kernel_siginfo_t *from,bool x32_ABI);#endif /* _ASM_X86_COMPAT_H */
drivers/usb/core/devio.c +2 -2
@@ -582,7 +582,7 @@ static void async_completed(struct urb *urb) {struct async *as = urb->context;struct usb_dev_state *ps = as->ps; -struct siginfo sinfo; +struct kernel_siginfo sinfo;struct pid *pid =NULL ;const struct cred *cred =NULL ;unsigned long flags;
@@ -2599,7 +2599,7 @@ const struct file_operations usbdev_file_operations = {static void usbdev_remove (struct usb_device *udev) {struct usb_dev_state *ps; -struct siginfo sinfo; +struct kernel_siginfo sinfo;while (!list_empty (&udev->filelist)) { ps = list_entry(udev->filelist.next, struct usb_dev_state, list);
fs/binfmt_elf.c +3 -3
@@ -1580,7 +1580,7 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm) }static void fill_siginfo_note (struct memelfnote *note,user_siginfo_t *csigdata, -const siginfo_t *siginfo) +const kernel_siginfo_t *siginfo) {mm_segment_t old_fs =get_fs ();set_fs (KERNEL_DS );
@@ -1782,7 +1782,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,static int fill_note_info (struct elfhdr *elf,int phdrs,struct elf_note_info *info, -const siginfo_t *siginfo,struct pt_regs *regs) +const kernel_siginfo_t *siginfo,struct pt_regs *regs) {struct task_struct *dump_task = current;const struct user_regset_view *view =task_user_regset_view (dump_task);
@@ -2031,7 +2031,7 @@ static int elf_note_info_init(struct elf_note_info *info)static int fill_note_info (struct elfhdr *elf,int phdrs,struct elf_note_info *info, -const siginfo_t *siginfo,struct pt_regs *regs) +const kernel_siginfo_t *siginfo,struct pt_regs *regs) {struct list_head *t;struct core_thread *ct;
fs/coredump.c +1 -1
@@ -536,7 +536,7 @@ static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)return err; } -void do_coredump (const siginfo_t *siginfo) +void do_coredump (const kernel_siginfo_t *siginfo) {struct core_state core_state;struct core_name cn;
fs/fcntl.c +1 -1
@@ -735,7 +735,7 @@ static void send_sigio_to_task(struct task_struct *p,return ;switch (signum) { -siginfo_t si; +kernel_siginfo_t si;default :/* Queue a rt signal with the appropriate fd as its value. We use SI_SIGIO as the source, not
fs/signalfd.c +3 -3
@@ -79,7 +79,7 @@ static __poll_t signalfd_poll(struct file *file, poll_table *wait)* Copied from copy_siginfo_to_user() in kernel/signal.c */ static int signalfd_copyinfo (struct signalfd_siginfo __user *uinfo, -siginfo_t const *kinfo) +kernel_siginfo_t const *kinfo) {struct signalfd_siginfo new;
@@ -163,7 +163,7 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,return sizeof (*uinfo); } -static ssize_t signalfd_dequeue (struct signalfd_ctx *ctx,siginfo_t *info, +static ssize_t signalfd_dequeue (struct signalfd_ctx *ctx,kernel_siginfo_t *info,int nonblock) {ssize_t ret;
@@ -215,7 +215,7 @@ static ssize_t signalfd_read(struct file *file, char __user *buf, size_t count,struct signalfd_siginfo __user *siginfo;int nonblock = file->f_flags &O_NONBLOCK ;ssize_t ret, total =0 ; -siginfo_t info; +kernel_siginfo_t info; count /=sizeof (struct signalfd_siginfo );if (!count)
include/linux/binfmts.h +1 -1
@@ -78,7 +78,7 @@ struct linux_binprm {/* Function parameter for binfmt->coredump */ struct coredump_params { -const siginfo_t *siginfo; +const kernel_siginfo_t *siginfo;struct pt_regs *regs;struct file *file;unsigned long limit;
include/linux/compat.h +2 -2
@@ -452,8 +452,8 @@ long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask, unsigned long bitmap_size);long compat_put_bitmap (compat_ulong_t __user *umask,unsigned long *mask,unsigned long bitmap_size); -int copy_siginfo_from_user32 (siginfo_t *to,const struct compat_siginfo __user *from); -int copy_siginfo_to_user32 (struct compat_siginfo __user *to,const siginfo_t *from); +int copy_siginfo_from_user32 (kernel_siginfo_t *to,const struct compat_siginfo __user *from); +int copy_siginfo_to_user32 (struct compat_siginfo __user *to,const kernel_siginfo_t *from);int get_compat_sigevent (struct sigevent *event,const struct compat_sigevent __user *u_event);
include/linux/coredump.h +2 -2
@@ -17,9 +17,9 @@ extern int dump_emit(struct coredump_params *cprm, const void *addr, int nr);extern int dump_align (struct coredump_params *cprm,int align);extern void dump_truncate (struct coredump_params *cprm);#ifdef CONFIG_COREDUMP -extern void do_coredump (const siginfo_t *siginfo); +extern void do_coredump (const kernel_siginfo_t *siginfo);#else -static inline void do_coredump (const siginfo_t *siginfo) {} +static inline void do_coredump (const kernel_siginfo_t *siginfo) {}#endif #endif /* _LINUX_COREDUMP_H */
include/linux/lsm_hooks.h +2 -2
@@ -672,7 +672,7 @@* Return 0 if permission is granted. * @task_kill: * Check permission before sending signal @sig to @p. @info can be NULL, -* the constant 1, or a pointer to a siginfo structure. If @info is 1 or +* the constant 1, or a pointer to a kernel_siginfo structure. If @info is 1 or * SI_FROMKERNEL(info) is true, then the signal should be viewed as coming * from the kernel and should typically be permitted. * SIGIO signals are handled separately by the send_sigiotask hook in
@@ -1606,7 +1606,7 @@ union security_list_options {int (*task_setscheduler)(struct task_struct *p);int (*task_getscheduler)(struct task_struct *p);int (*task_movememory)(struct task_struct *p); -int (*task_kill)(struct task_struct *p,struct siginfo *info, +int (*task_kill)(struct task_struct *p,struct kernel_siginfo *info,int sig,const struct cred *cred);int (*task_prctl)(int option,unsigned long arg2,unsigned long arg3,unsigned long arg4,unsigned long arg5);
include/linux/posix-timers.h +1 -1
@@ -126,5 +126,5 @@ void set_process_cpu_timer(struct task_struct *task, unsigned int clock_idx,void update_rlimit_cpu (struct task_struct *task,unsigned long rlim_new); -void posixtimer_rearm (struct siginfo *info); +void posixtimer_rearm (struct kernel_siginfo *info);#endif
include/linux/ptrace.h +1 -1
@@ -341,7 +341,7 @@ extern void user_single_step_report(struct pt_regs *regs);#else static inline void user_single_step_report (struct pt_regs *regs) { -siginfo_t info; +kernel_siginfo_t info;clear_siginfo (&info); info.si_signo =SIGTRAP ; info.si_errno =0 ;
include/linux/sched.h +1 -1
@@ -960,7 +960,7 @@ struct task_struct {/* Ptrace state: */ unsigned long ptrace_message; -siginfo_t *last_siginfo; +kernel_siginfo_t *last_siginfo;struct task_io_accounting ioac;#ifdef CONFIG_TASK_XACCT
include/linux/sched/signal.h +9 -9
@@ -270,12 +270,12 @@ static inline int signal_group_exit(const struct signal_struct *sig)extern void flush_signals (struct task_struct *);extern void ignore_signals (struct task_struct *);extern void flush_signal_handlers (struct task_struct *,int force_default); -extern int dequeue_signal (struct task_struct *tsk,sigset_t *mask,siginfo_t *info); +extern int dequeue_signal (struct task_struct *tsk,sigset_t *mask,kernel_siginfo_t *info);static inline int kernel_dequeue_signal (void ) {struct task_struct *tsk = current; -siginfo_t __info; +kernel_siginfo_t __info;int ret;spin_lock_irq (&tsk->sighand->siglock);
@@ -322,12 +322,12 @@ int force_sig_pkuerr(void __user *addr, u32 pkey);int force_sig_ptrace_errno_trap (int errno,void __user *addr); -extern int send_sig_info (int ,struct siginfo *,struct task_struct *); +extern int send_sig_info (int ,struct kernel_siginfo *,struct task_struct *);extern void force_sigsegv (int sig,struct task_struct *p); -extern int force_sig_info (int ,struct siginfo *,struct task_struct *); -extern int __kill_pgrp_info (int sig,struct siginfo *info,struct pid *pgrp); -extern int kill_pid_info (int sig,struct siginfo *info,struct pid *pid); -extern int kill_pid_info_as_cred (int ,struct siginfo *,struct pid *, +extern int force_sig_info (int ,struct kernel_siginfo *,struct task_struct *); +extern int __kill_pgrp_info (int sig,struct kernel_siginfo *info,struct pid *pgrp); +extern int kill_pid_info (int sig,struct kernel_siginfo *info,struct pid *pid); +extern int kill_pid_info_as_cred (int ,struct kernel_siginfo *,struct pid *,const struct cred *);extern int kill_pgrp (struct pid *pid,int sig,int priv);extern int kill_pid (struct pid *pid,int sig,int priv);
@@ -475,8 +475,8 @@ static inline int kill_cad_pid(int sig, int priv) }/* These can be the second arg to send_sig_info/send_group_sig_info. */ -#define SEND_SIG_NOINFO ((struct siginfo *) 0) -#define SEND_SIG_PRIV ((struct siginfo *) 1) +#define SEND_SIG_NOINFO ((struct kernel_siginfo *) 0) +#define SEND_SIG_PRIV ((struct kernel_siginfo *) 1)/* * True if we are on the alternate signal stack.
include/linux/security.h +3 -3
@@ -35,7 +35,7 @@struct linux_binprm ;struct cred ;struct rlimit ; -struct siginfo ; +struct kernel_siginfo ;struct sembuf ;struct kern_ipc_perm ;struct audit_context ;
@@ -361,7 +361,7 @@ int security_task_setrlimit(struct task_struct *p, unsigned int resource,int security_task_setscheduler (struct task_struct *p);int security_task_getscheduler (struct task_struct *p);int security_task_movememory (struct task_struct *p); -int security_task_kill (struct task_struct *p,struct siginfo *info, +int security_task_kill (struct task_struct *p,struct kernel_siginfo *info,int sig,const struct cred *cred);int security_task_prctl (int option,unsigned long arg2,unsigned long arg3,unsigned long arg4,unsigned long arg5);
@@ -1020,7 +1020,7 @@ static inline int security_task_movememory(struct task_struct *p) }static inline int security_task_kill (struct task_struct *p, -struct siginfo *info,int sig, +struct kernel_siginfo *info,int sig,const struct cred *cred) {return 0 ;
include/linux/signal.h +8 -7
@@ -11,18 +11,19 @@ struct task_struct;/* for sysctl */ extern int print_fatal_signals; -static inline void copy_siginfo (struct siginfo *to,const struct siginfo *from) +static inline void copy_siginfo (kernel_siginfo_t *to, +const kernel_siginfo_t *from) {memcpy (to, from,sizeof (*to)); } -static inline void clear_siginfo (struct siginfo *info) +static inline void clear_siginfo (kernel_siginfo_t *info) {memset (info,0 ,sizeof (*info)); } -int copy_siginfo_to_user (struct siginfo __user *to,const struct siginfo *from); -int copy_siginfo_from_user (struct siginfo *to,const struct siginfo __user *from); +int copy_siginfo_to_user (siginfo_t __user *to,const kernel_siginfo_t *from); +int copy_siginfo_from_user (kernel_siginfo_t *to,const siginfo_t __user *from);enum siginfo_layout {SIL_KILL ,
@@ -258,11 +259,11 @@ struct pt_regs;enum pid_type ;extern int next_signal (struct sigpending *pending,sigset_t *mask); -extern int do_send_sig_info (int sig,struct siginfo *info, +extern int do_send_sig_info (int sig,struct kernel_siginfo *info,struct task_struct *p,enum pid_type type); -extern int group_send_sig_info (int sig,struct siginfo *info, +extern int group_send_sig_info (int sig,struct kernel_siginfo *info,struct task_struct *p,enum pid_type type); -extern int __group_send_sig_info (int ,struct siginfo *,struct task_struct *); +extern int __group_send_sig_info (int ,struct kernel_siginfo *,struct task_struct *);extern int sigprocmask (int ,sigset_t *,sigset_t *);extern void set_current_blocked (sigset_t *);extern void __set_current_blocked (const sigset_t *);
include/linux/signal_types.h +9 -2
@@ -9,6 +9,13 @@#include <linux/list.h> #include <uapi/linux/signal.h> +typedef struct kernel_siginfo { +union { +__SIGINFO ; +int _si_pad[SI_MAX_SIZE /sizeof (int )]; + }; +}kernel_siginfo_t ; +/* * Real Time signals may be queued. */
@@ -16,7 +23,7 @@struct sigqueue {struct list_head list;int flags; -siginfo_t info; +kernel_siginfo_t info;struct user_struct *user; };
@@ -60,7 +67,7 @@ struct old_sigaction {struct ksignal {struct k_sigaction ka; -siginfo_t info; +kernel_siginfo_t info;int sig; };
include/trace/events/signal.h +2 -2
@@ -49,7 +49,7 @@ enum {*/ TRACE_EVENT(signal_generate, - TP_PROTO(int sig, struct siginfo *info, struct task_struct *task, + TP_PROTO(int sig, struct kernel_siginfo *info, struct task_struct *task, int group, int result), TP_ARGS(sig, info, task, group, result),
@@ -95,7 +95,7 @@ TRACE_EVENT(signal_generate,*/ TRACE_EVENT(signal_deliver, - TP_PROTO(int sig, struct siginfo *info, struct k_sigaction *ka), + TP_PROTO(int sig, struct kernel_siginfo *info, struct k_sigaction *ka), TP_ARGS(sig, info, ka),
ipc/mqueue.c +1 -1
@@ -655,7 +655,7 @@ static void __do_notify(struct mqueue_inode_info *info)* synchronously. */ if (info->notify_owner && info->attr.mq_curmsgs ==1 ) { -struct siginfo sig_i; +struct kernel_siginfo sig_i;switch (info->notify.sigev_notify) {case SIGEV_NONE :break ;
kernel/ptrace.c +5 -5
@@ -651,7 +651,7 @@ static int ptrace_setoptions(struct task_struct *child, unsigned long data)return 0 ; } -static int ptrace_getsiginfo (struct task_struct *child,siginfo_t *info) +static int ptrace_getsiginfo (struct task_struct *child,kernel_siginfo_t *info) {unsigned long flags;int error = -ESRCH ;
@@ -667,7 +667,7 @@ static int ptrace_getsiginfo(struct task_struct *child, siginfo_t *info)return error; } -static int ptrace_setsiginfo (struct task_struct *child,const siginfo_t *info) +static int ptrace_setsiginfo (struct task_struct *child,const kernel_siginfo_t *info) {unsigned long flags;int error = -ESRCH ;
@@ -709,7 +709,7 @@ static int ptrace_peek_siginfo(struct task_struct *child, pending = &child->pending;for (i =0 ; i < arg.nr; ) { -siginfo_t info; +kernel_siginfo_t info;s32 off = arg.off + i;spin_lock_irq (&child->sighand->siglock);
@@ -885,7 +885,7 @@ int ptrace_request(struct task_struct *child, long request, {bool seized = child->ptrace &PT_SEIZED ;int ret = -EIO ; -siginfo_t siginfo, *si; +kernel_siginfo_t siginfo, *si;void __user *datavp = (void __user *) data;unsigned long __user *datalp = datavp;unsigned long flags;
@@ -1180,7 +1180,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request, {compat_ulong_t __user *datap =compat_ptr (data);compat_ulong_t word; -siginfo_t siginfo; +kernel_siginfo_t siginfo;int ret;switch (request) {
kernel/seccomp.c +3 -3
@@ -522,7 +522,7 @@ void put_seccomp_filter(struct task_struct *tsk)__put_seccomp_filter (tsk->seccomp.filter); } -static void seccomp_init_siginfo (siginfo_t *info,int syscall,int reason) +static void seccomp_init_siginfo (kernel_siginfo_t *info,int syscall,int reason) {clear_siginfo (info); info->si_signo =SIGSYS ;
@@ -542,7 +542,7 @@ static void seccomp_init_siginfo(siginfo_t *info, int syscall, int reason)*/ static void seccomp_send_sigsys (int syscall,int reason) { -struct siginfo info; +struct kernel_siginfo info;seccomp_init_siginfo (&info, syscall, reason);force_sig_info (SIGSYS , &info, current); }
@@ -747,7 +747,7 @@ static int __seccomp_filter(int this_syscall, const struct seccomp_data *sd,/* Dump core only if this is the last remaining thread. */ if (action ==SECCOMP_RET_KILL_PROCESS ||get_nr_threads (current) ==1 ) { -siginfo_t info; +kernel_siginfo_t info;/* Show the original registers in the dump. */ syscall_rollback (current,task_pt_regs (current));
kernel/signal.c +99 -52
447 lines not on this page · raw message
kernel/time/posix-timers.c +1 -1
@@ -308,7 +308,7 @@ static void common_hrtimer_rearm(struct k_itimer *timr)* To protect against the timer going away while the interrupt is queued, * we require that the it_requeue_pending flag be set. */ -void posixtimer_rearm (struct siginfo *info) +void posixtimer_rearm (struct kernel_siginfo *info) {struct k_itimer *timr;unsigned long flags;
security/apparmor/lsm.c +1 -1
@@ -732,7 +732,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,return error; } -static int apparmor_task_kill (struct task_struct *target,struct siginfo *info, +static int apparmor_task_kill (struct task_struct *target,struct kernel_siginfo *info,int sig,const struct cred *cred) {struct aa_label *cl, *tl;
security/security.c +1 -1
@@ -1147,7 +1147,7 @@ int security_task_movememory(struct task_struct *p)return call_int_hook (task_movememory,0 , p); } -int security_task_kill (struct task_struct *p,struct siginfo *info, +int security_task_kill (struct task_struct *p,struct kernel_siginfo *info,int sig,const struct cred *cred) {return call_int_hook (task_kill,0 , p, info, sig, cred);
security/selinux/hooks.c +1 -1
@@ -4186,7 +4186,7 @@ static int selinux_task_movememory(struct task_struct *p) PROCESS__SETSCHED, NULL); } -static int selinux_task_kill (struct task_struct *p,struct siginfo *info, +static int selinux_task_kill (struct task_struct *p,struct kernel_siginfo *info,int sig,const struct cred *cred) {u32 secid;
security/smack/smack_lsm.c +1 -1
@@ -2251,7 +2251,7 @@ static int smack_task_movememory(struct task_struct *p)* Return 0 if write access is permitted * */ -static int smack_task_kill (struct task_struct *p,struct siginfo *info, +static int smack_task_kill (struct task_struct *p,struct kernel_siginfo *info,int sig,const struct cred *cred) {struct smk_audit_info ad;
Signature · 1 line
2.17.1
PATCH 6/6 signal: Use a smaller struct siginfo in the kernel
In reply to Eric W. BiedermanWe reserve 128 bytes for struct siginfo but only use about 48 bytes on 64bit and 32 bytes on 32bit. Someday we might use more but it is unlikely to be anytime soon.
Userspace seems content with just enough bytes of siginfo to implement sigqueue. Or in the case of checkpoint/restart reinjecting signals the kernel has sent.
Reducing the stack footprint and the work to copy siginfo around from 2 cachelines to 1 cachelines seems worth doing even if I don't have benchmarks to show a performance difference.
--- include/linux/signal.h | 2 + include/linux/signal_types.h | 5 +-- kernel/signal.c | 82 ++++++++++++++++++++++++++++-------- 3 files changed, 67 insertions(+), 22 deletions(-)
include/linux/signal.h +2 -0
@@ -22,6 +22,8 @@ static inline void clear_siginfo(kernel_siginfo_t *info)memset (info,0 ,sizeof (*info)); } +#define SI_EXPANSION_SIZE (sizeof(struct siginfo) - sizeof(struct kernel_siginfo)) +int copy_siginfo_to_user (siginfo_t __user *to,const kernel_siginfo_t *from);int copy_siginfo_from_user (kernel_siginfo_t *to,const siginfo_t __user *from);
include/linux/signal_types.h +1 -4
@@ -10,10 +10,7 @@#include <uapi/linux/signal.h> typedef struct kernel_siginfo { -union { -__SIGINFO ; -int _si_pad[SI_MAX_SIZE /sizeof (int )]; - }; +__SIGINFO ; }kernel_siginfo_t ;/*
kernel/signal.c +64 -18
108 lines not on this page · raw message
Signature · 1 line
2.17.1