Skip to content

Commit

Permalink
signal/arm64: Use force_sig not force_sig_fault for SIGKILL
Browse files Browse the repository at this point in the history
I don't think this is userspace visible but SIGKILL does not have
any si_codes that use the fault member of the siginfo union.  Correct
this the simple way and call force_sig instead of force_sig_fault when
the signal is SIGKILL.

The two know places where synchronous SIGKILL are generated are
do_bad_area and fpsimd_save.  The call paths to force_sig_fault are:
do_bad_area
  arm64_force_sig_fault
    force_sig_fault
force_signal_inject
  arm64_notify_die
    arm64_force_sig_fault
       force_sig_fault

Which means correcting this in arm64_force_sig_fault is enough
to ensure the arm64 code is not misusing the generic code, which
could lead to maintenance problems later.

Cc: [email protected]
Cc: Dave Martin <[email protected]>
Cc: James Morse <[email protected]>
Cc: Will Deacon <[email protected]>
Acked-by: Will Deacon <[email protected]>
Fixes: af40ff6 ("arm64: signal: Ensure si_code is valid for all fault signals")
Signed-off-by: "Eric W. Biederman" <[email protected]>
  • Loading branch information
ebiederm committed May 27, 2019
1 parent 7a0cf09 commit 82e10af
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/arm64/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,10 @@ void arm64_force_sig_fault(int signo, int code, void __user *addr,
const char *str)
{
arm64_show_signal(signo, str);
force_sig_fault(signo, code, addr, current);
if (signo == SIGKILL)
force_sig(SIGKILL, current);
else
force_sig_fault(signo, code, addr, current);
}

void arm64_force_sig_mceerr(int code, void __user *addr, short lsb,
Expand Down

0 comments on commit 82e10af

Please sign in to comment.