diff options
| -rw-r--r-- | include/linux/ptrace.h | 2 | ||||
| -rw-r--r-- | include/linux/sched/signal.h | 2 | ||||
| -rw-r--r-- | kernel/seccomp.c | 2 | ||||
| -rw-r--r-- | kernel/signal.c | 14 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index d5084ebd9f03..2a9df80ea887 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h | |||
| @@ -355,7 +355,7 @@ static inline void user_single_step_report(struct pt_regs *regs) | |||
| 355 | info.si_code = SI_USER; | 355 | info.si_code = SI_USER; |
| 356 | info.si_pid = 0; | 356 | info.si_pid = 0; |
| 357 | info.si_uid = 0; | 357 | info.si_uid = 0; |
| 358 | force_sig_info(info.si_signo, &info, current); | 358 | force_sig_info(&info); |
| 359 | } | 359 | } |
| 360 | #endif | 360 | #endif |
| 361 | 361 | ||
diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h index 7f872506e1de..532458698bde 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h | |||
| @@ -329,7 +329,7 @@ int force_sig_ptrace_errno_trap(int errno, void __user *addr); | |||
| 329 | 329 | ||
| 330 | extern int send_sig_info(int, struct kernel_siginfo *, struct task_struct *); | 330 | extern int send_sig_info(int, struct kernel_siginfo *, struct task_struct *); |
| 331 | extern void force_sigsegv(int sig); | 331 | extern void force_sigsegv(int sig); |
| 332 | extern int force_sig_info(int, struct kernel_siginfo *, struct task_struct *); | 332 | extern int force_sig_info(struct kernel_siginfo *); |
| 333 | extern int __kill_pgrp_info(int sig, struct kernel_siginfo *info, struct pid *pgrp); | 333 | extern int __kill_pgrp_info(int sig, struct kernel_siginfo *info, struct pid *pgrp); |
| 334 | extern int kill_pid_info(int sig, struct kernel_siginfo *info, struct pid *pid); | 334 | extern int kill_pid_info(int sig, struct kernel_siginfo *info, struct pid *pid); |
| 335 | extern int kill_pid_usb_asyncio(int sig, int errno, sigval_t addr, struct pid *, | 335 | extern int kill_pid_usb_asyncio(int sig, int errno, sigval_t addr, struct pid *, |
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 811b4a86cdf6..dba52a7db5e8 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c | |||
| @@ -609,7 +609,7 @@ static void seccomp_send_sigsys(int syscall, int reason) | |||
| 609 | { | 609 | { |
| 610 | struct kernel_siginfo info; | 610 | struct kernel_siginfo info; |
| 611 | seccomp_init_siginfo(&info, syscall, reason); | 611 | seccomp_init_siginfo(&info, syscall, reason); |
| 612 | force_sig_info(SIGSYS, &info, current); | 612 | force_sig_info(&info); |
| 613 | } | 613 | } |
| 614 | #endif /* CONFIG_SECCOMP_FILTER */ | 614 | #endif /* CONFIG_SECCOMP_FILTER */ |
| 615 | 615 | ||
diff --git a/kernel/signal.c b/kernel/signal.c index 0984158cd41a..ff6944e4964e 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -1325,9 +1325,9 @@ force_sig_info_to_task(struct kernel_siginfo *info, struct task_struct *t) | |||
| 1325 | return ret; | 1325 | return ret; |
| 1326 | } | 1326 | } |
| 1327 | 1327 | ||
| 1328 | int force_sig_info(int sig, struct kernel_siginfo *info, struct task_struct *t) | 1328 | int force_sig_info(struct kernel_siginfo *info) |
| 1329 | { | 1329 | { |
| 1330 | return force_sig_info_to_task(info, t); | 1330 | return force_sig_info_to_task(info, current); |
| 1331 | } | 1331 | } |
| 1332 | 1332 | ||
| 1333 | /* | 1333 | /* |
| @@ -1619,7 +1619,7 @@ void force_sig(int sig) | |||
| 1619 | info.si_code = SI_KERNEL; | 1619 | info.si_code = SI_KERNEL; |
| 1620 | info.si_pid = 0; | 1620 | info.si_pid = 0; |
| 1621 | info.si_uid = 0; | 1621 | info.si_uid = 0; |
| 1622 | force_sig_info(info.si_signo, &info, current); | 1622 | force_sig_info(&info); |
| 1623 | } | 1623 | } |
| 1624 | EXPORT_SYMBOL(force_sig); | 1624 | EXPORT_SYMBOL(force_sig); |
| 1625 | 1625 | ||
| @@ -1708,7 +1708,7 @@ int force_sig_mceerr(int code, void __user *addr, short lsb) | |||
| 1708 | info.si_code = code; | 1708 | info.si_code = code; |
| 1709 | info.si_addr = addr; | 1709 | info.si_addr = addr; |
| 1710 | info.si_addr_lsb = lsb; | 1710 | info.si_addr_lsb = lsb; |
| 1711 | return force_sig_info(info.si_signo, &info, current); | 1711 | return force_sig_info(&info); |
| 1712 | } | 1712 | } |
| 1713 | 1713 | ||
| 1714 | int send_sig_mceerr(int code, void __user *addr, short lsb, struct task_struct *t) | 1714 | int send_sig_mceerr(int code, void __user *addr, short lsb, struct task_struct *t) |
| @@ -1737,7 +1737,7 @@ int force_sig_bnderr(void __user *addr, void __user *lower, void __user *upper) | |||
| 1737 | info.si_addr = addr; | 1737 | info.si_addr = addr; |
| 1738 | info.si_lower = lower; | 1738 | info.si_lower = lower; |
| 1739 | info.si_upper = upper; | 1739 | info.si_upper = upper; |
| 1740 | return force_sig_info(info.si_signo, &info, current); | 1740 | return force_sig_info(&info); |
| 1741 | } | 1741 | } |
| 1742 | 1742 | ||
| 1743 | #ifdef SEGV_PKUERR | 1743 | #ifdef SEGV_PKUERR |
| @@ -1751,7 +1751,7 @@ int force_sig_pkuerr(void __user *addr, u32 pkey) | |||
| 1751 | info.si_code = SEGV_PKUERR; | 1751 | info.si_code = SEGV_PKUERR; |
| 1752 | info.si_addr = addr; | 1752 | info.si_addr = addr; |
| 1753 | info.si_pkey = pkey; | 1753 | info.si_pkey = pkey; |
| 1754 | return force_sig_info(info.si_signo, &info, current); | 1754 | return force_sig_info(&info); |
| 1755 | } | 1755 | } |
| 1756 | #endif | 1756 | #endif |
| 1757 | 1757 | ||
| @@ -1767,7 +1767,7 @@ int force_sig_ptrace_errno_trap(int errno, void __user *addr) | |||
| 1767 | info.si_errno = errno; | 1767 | info.si_errno = errno; |
| 1768 | info.si_code = TRAP_HWBKPT; | 1768 | info.si_code = TRAP_HWBKPT; |
| 1769 | info.si_addr = addr; | 1769 | info.si_addr = addr; |
| 1770 | return force_sig_info(info.si_signo, &info, current); | 1770 | return force_sig_info(&info); |
| 1771 | } | 1771 | } |
| 1772 | 1772 | ||
| 1773 | int kill_pgrp(struct pid *pid, int sig, int priv) | 1773 | int kill_pgrp(struct pid *pid, int sig, int priv) |
