Skip to content

Commit d76cac6

Browse files
ebiedermwildea01
authored andcommitted
signal/arm64: Use force_sig not force_sig_fault for SIGKILL
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]> Fixes: af40ff6 ("arm64: signal: Ensure si_code is valid for all fault signals") Signed-off-by: "Eric W. Biederman" <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent 3fd00be commit d76cac6

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/arm64/kernel/traps.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,10 @@ void arm64_force_sig_fault(int signo, int code, void __user *addr,
252252
const char *str)
253253
{
254254
arm64_show_signal(signo, str);
255-
force_sig_fault(signo, code, addr, current);
255+
if (signo == SIGKILL)
256+
force_sig(SIGKILL, current);
257+
else
258+
force_sig_fault(signo, code, addr, current);
256259
}
257260

258261
void arm64_force_sig_mceerr(int code, void __user *addr, short lsb,

0 commit comments

Comments
 (0)