diff options
| author |  Eric W. Biederman <ebiederm@xmission.com>
| 2018-04-15 19:50:48 -0500 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com>
| 2018-04-25 10:44:11 -0500 |
| commit | bc08c0781dbe5ec996bac1088f944723103729af (patch) | |
| tree | 12ff168344f89d72b61dd99851417c564c25c071 /arch/um/kernel/ptrace.c | |
| parent | signal/sparc: Use force_sig_fault where appropriate (diff) | |
| download | linux-bc08c0781dbe5ec996bac1088f944723103729af.tar.gz linux-bc08c0781dbe5ec996bac1088f944723103729af.tar.bz2 linux-bc08c0781dbe5ec996bac1088f944723103729af.zip | |
signal/um: Use force_sig_fault where appropriate
Filling in struct siginfo before calling force_sig_info a tedious and
error prone process, where once in a great while the wrong fields
are filled out, and siginfo has been inconsistently cleared.
Simplify this process by using the helper force_sig_fault. Which
takes as a parameters all of the information it needs, ensures
all of the fiddly bits of filling in struct siginfo are done properly
and then calls force_sig_info.
In short about a 5 line reduction in code for every time force_sig_info
is called, which makes the calling function clearer.
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: linux-um@lists.infradead.org
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'arch/um/kernel/ptrace.c')
| -rw-r--r-- | arch/um/kernel/ptrace.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c index bc2a516c190f..1a1d88a4d940 100644 --- a/arch/um/kernel/ptrace.c +++ b/arch/um/kernel/ptrace.c @@ -115,17 +115,10 @@ long arch_ptrace(struct task_struct *child, long request, static void send_sigtrap(struct task_struct *tsk, struct uml_pt_regs *regs, int error_code) { - struct siginfo info; - - memset(&info, 0, sizeof(info)); - info.si_signo = SIGTRAP; - info.si_code = TRAP_BRKPT; - - /* User-mode eip? */ - info.si_addr = UPT_IS_USER(regs) ? (void __user *) UPT_IP(regs) : NULL; - /* Send us the fake SIGTRAP */ - force_sig_info(SIGTRAP, &info, tsk); + force_sig_fault(SIGTRAP, TRAP_BRKPT, + /* User-mode eip? */ + UPT_IS_USER(regs) ? (void __user *) UPT_IP(regs) : NULL, tsk); } /* |