diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2019-05-23 11:17:27 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2019-05-27 10:36:28 -0400 |
commit | 3cf5d076fb4d48979f382bc9452765bf8b79e740 (patch) | |
tree | 935f7af65a7a7f1ba514f1da5b207e2dc298eaca /arch/m68k | |
parent | cb44c9a0ab21a9ae4dfcabac1ed8e38aa872d1af (diff) |
signal: Remove task parameter from force_sig
All of the remaining callers pass current into force_sig so
remove the task parameter to make this obvious and to make
misuse more difficult in the future.
This also makes it clear force_sig passes current into force_sig_info.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/kernel/signal.c | 4 | ||||
-rw-r--r-- | arch/m68k/kernel/traps.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index 87e7f3639839..05610e6924c1 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c | |||
@@ -803,7 +803,7 @@ asmlinkage int do_sigreturn(struct pt_regs *regs, struct switch_stack *sw) | |||
803 | return regs->d0; | 803 | return regs->d0; |
804 | 804 | ||
805 | badframe: | 805 | badframe: |
806 | force_sig(SIGSEGV, current); | 806 | force_sig(SIGSEGV); |
807 | return 0; | 807 | return 0; |
808 | } | 808 | } |
809 | 809 | ||
@@ -825,7 +825,7 @@ asmlinkage int do_rt_sigreturn(struct pt_regs *regs, struct switch_stack *sw) | |||
825 | return regs->d0; | 825 | return regs->d0; |
826 | 826 | ||
827 | badframe: | 827 | badframe: |
828 | force_sig(SIGSEGV, current); | 828 | force_sig(SIGSEGV); |
829 | return 0; | 829 | return 0; |
830 | } | 830 | } |
831 | 831 | ||
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index b2fd000b9285..2b6e143abd73 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c | |||
@@ -431,7 +431,7 @@ static inline void bus_error030 (struct frame *fp) | |||
431 | pr_err("BAD KERNEL BUSERR\n"); | 431 | pr_err("BAD KERNEL BUSERR\n"); |
432 | 432 | ||
433 | die_if_kernel("Oops", &fp->ptregs,0); | 433 | die_if_kernel("Oops", &fp->ptregs,0); |
434 | force_sig(SIGKILL, current); | 434 | force_sig(SIGKILL); |
435 | return; | 435 | return; |
436 | } | 436 | } |
437 | } else { | 437 | } else { |
@@ -463,7 +463,7 @@ static inline void bus_error030 (struct frame *fp) | |||
463 | !(ssw & RW) ? "write" : "read", addr, | 463 | !(ssw & RW) ? "write" : "read", addr, |
464 | fp->ptregs.pc); | 464 | fp->ptregs.pc); |
465 | die_if_kernel ("Oops", &fp->ptregs, buserr_type); | 465 | die_if_kernel ("Oops", &fp->ptregs, buserr_type); |
466 | force_sig (SIGBUS, current); | 466 | force_sig (SIGBUS); |
467 | return; | 467 | return; |
468 | } | 468 | } |
469 | 469 | ||
@@ -493,7 +493,7 @@ static inline void bus_error030 (struct frame *fp) | |||
493 | do_page_fault (&fp->ptregs, addr, 0); | 493 | do_page_fault (&fp->ptregs, addr, 0); |
494 | } else { | 494 | } else { |
495 | pr_debug("protection fault on insn access (segv).\n"); | 495 | pr_debug("protection fault on insn access (segv).\n"); |
496 | force_sig (SIGSEGV, current); | 496 | force_sig (SIGSEGV); |
497 | } | 497 | } |
498 | } | 498 | } |
499 | #else | 499 | #else |
@@ -571,7 +571,7 @@ static inline void bus_error030 (struct frame *fp) | |||
571 | !(ssw & RW) ? "write" : "read", addr, | 571 | !(ssw & RW) ? "write" : "read", addr, |
572 | fp->ptregs.pc); | 572 | fp->ptregs.pc); |
573 | die_if_kernel("Oops",&fp->ptregs,mmusr); | 573 | die_if_kernel("Oops",&fp->ptregs,mmusr); |
574 | force_sig(SIGSEGV, current); | 574 | force_sig(SIGSEGV); |
575 | return; | 575 | return; |
576 | } else { | 576 | } else { |
577 | #if 0 | 577 | #if 0 |
@@ -598,7 +598,7 @@ static inline void bus_error030 (struct frame *fp) | |||
598 | #endif | 598 | #endif |
599 | pr_debug("Unknown SIGSEGV - 1\n"); | 599 | pr_debug("Unknown SIGSEGV - 1\n"); |
600 | die_if_kernel("Oops",&fp->ptregs,mmusr); | 600 | die_if_kernel("Oops",&fp->ptregs,mmusr); |
601 | force_sig(SIGSEGV, current); | 601 | force_sig(SIGSEGV); |
602 | return; | 602 | return; |
603 | } | 603 | } |
604 | 604 | ||
@@ -621,7 +621,7 @@ static inline void bus_error030 (struct frame *fp) | |||
621 | buserr: | 621 | buserr: |
622 | pr_err("BAD KERNEL BUSERR\n"); | 622 | pr_err("BAD KERNEL BUSERR\n"); |
623 | die_if_kernel("Oops",&fp->ptregs,0); | 623 | die_if_kernel("Oops",&fp->ptregs,0); |
624 | force_sig(SIGKILL, current); | 624 | force_sig(SIGKILL); |
625 | return; | 625 | return; |
626 | } | 626 | } |
627 | 627 | ||
@@ -660,7 +660,7 @@ static inline void bus_error030 (struct frame *fp) | |||
660 | addr, fp->ptregs.pc); | 660 | addr, fp->ptregs.pc); |
661 | pr_debug("Unknown SIGSEGV - 2\n"); | 661 | pr_debug("Unknown SIGSEGV - 2\n"); |
662 | die_if_kernel("Oops",&fp->ptregs,mmusr); | 662 | die_if_kernel("Oops",&fp->ptregs,mmusr); |
663 | force_sig(SIGSEGV, current); | 663 | force_sig(SIGSEGV); |
664 | return; | 664 | return; |
665 | } | 665 | } |
666 | 666 | ||
@@ -804,7 +804,7 @@ asmlinkage void buserr_c(struct frame *fp) | |||
804 | default: | 804 | default: |
805 | die_if_kernel("bad frame format",&fp->ptregs,0); | 805 | die_if_kernel("bad frame format",&fp->ptregs,0); |
806 | pr_debug("Unknown SIGSEGV - 4\n"); | 806 | pr_debug("Unknown SIGSEGV - 4\n"); |
807 | force_sig(SIGSEGV, current); | 807 | force_sig(SIGSEGV); |
808 | } | 808 | } |
809 | } | 809 | } |
810 | 810 | ||