Skip to content

Commit a42c6de

Browse files
author
Al Viro
committed
move key_repace_session_keyring() into tracehook_notify_resume()
Signed-off-by: Al Viro <[email protected]>
1 parent 1227dd7 commit a42c6de

File tree

30 files changed

+6
-66
lines changed

30 files changed

+6
-66
lines changed

‎arch/alpha/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,5 @@ do_notify_resume(struct pt_regs *regs, struct switch_stack *sw,
590590
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
591591
clear_thread_flag(TIF_NOTIFY_RESUME);
592592
tracehook_notify_resume(regs);
593-
if (current->replacement_session_keyring)
594-
key_replace_session_keyring();
595593
}
596594
}

‎arch/arm/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,5 @@ do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall)
728728
if (thread_flags & _TIF_NOTIFY_RESUME) {
729729
clear_thread_flag(TIF_NOTIFY_RESUME);
730730
tracehook_notify_resume(regs);
731-
if (current->replacement_session_keyring)
732-
key_replace_session_keyring();
733731
}
734732
}

‎arch/avr32/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti)
321321
if (ti->flags & _TIF_NOTIFY_RESUME) {
322322
clear_thread_flag(TIF_NOTIFY_RESUME);
323323
tracehook_notify_resume(regs);
324-
if (current->replacement_session_keyring)
325-
key_replace_session_keyring();
326324
}
327325
}

‎arch/blackfin/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs)
336336
if (test_thread_flag(TIF_NOTIFY_RESUME)) {
337337
clear_thread_flag(TIF_NOTIFY_RESUME);
338338
tracehook_notify_resume(regs);
339-
if (current->replacement_session_keyring)
340-
key_replace_session_keyring();
341339
}
342340
}
343341

‎arch/c6x/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags,
364364
if (thread_info_flags & (1 << TIF_NOTIFY_RESUME)) {
365365
clear_thread_flag(TIF_NOTIFY_RESUME);
366366
tracehook_notify_resume(regs);
367-
if (current->replacement_session_keyring)
368-
key_replace_session_keyring();
369367
}
370368
}

‎arch/cris/kernel/ptrace.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,5 @@ void do_notify_resume(int canrestart, struct pt_regs *regs,
4040
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
4141
clear_thread_flag(TIF_NOTIFY_RESUME);
4242
tracehook_notify_resume(regs);
43-
if (current->replacement_session_keyring)
44-
key_replace_session_keyring();
4543
}
4644
}

‎arch/frv/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,8 +562,6 @@ asmlinkage void do_notify_resume(__u32 thread_info_flags)
562562
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
563563
clear_thread_flag(TIF_NOTIFY_RESUME);
564564
tracehook_notify_resume(__frame);
565-
if (current->replacement_session_keyring)
566-
key_replace_session_keyring();
567565
}
568566

569567
} /* end do_notify_resume() */

‎arch/h8300/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags)
513513
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
514514
clear_thread_flag(TIF_NOTIFY_RESUME);
515515
tracehook_notify_resume(regs);
516-
if (current->replacement_session_keyring)
517-
key_replace_session_keyring();
518516
}
519517
}

‎arch/hexagon/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
273273
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
274274
clear_thread_flag(TIF_NOTIFY_RESUME);
275275
tracehook_notify_resume(regs);
276-
if (current->replacement_session_keyring)
277-
key_replace_session_keyring();
278276
}
279277
}
280278

‎arch/ia64/kernel/process.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,6 @@ do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
199199
if (test_thread_flag(TIF_NOTIFY_RESUME)) {
200200
clear_thread_flag(TIF_NOTIFY_RESUME);
201201
tracehook_notify_resume(&scr->pt);
202-
if (current->replacement_session_keyring)
203-
key_replace_session_keyring();
204202
}
205203

206204
/* copy user rbs to kernel rbs */

‎arch/m32r/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,6 @@ void do_notify_resume(struct pt_regs *regs, __u32 thread_info_flags)
383383
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
384384
clear_thread_flag(TIF_NOTIFY_RESUME);
385385
tracehook_notify_resume(regs);
386-
if (current->replacement_session_keyring)
387-
key_replace_session_keyring();
388386
}
389387

390388
clear_thread_flag(TIF_IRET);

‎arch/m68k/kernel/signal.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,9 +1193,6 @@ void do_notify_resume(struct pt_regs *regs)
11931193
if (test_thread_flag(TIF_SIGPENDING))
11941194
do_signal(regs);
11951195

1196-
if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) {
1196+
if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
11971197
tracehook_notify_resume(regs);
1198-
if (current->replacement_session_keyring)
1199-
key_replace_session_keyring();
1200-
}
12011198
}

‎arch/microblaze/kernel/signal.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,6 @@ void do_notify_resume(struct pt_regs *regs, int in_syscall)
401401
if (test_thread_flag(TIF_SIGPENDING))
402402
do_signal(regs, in_syscall);
403403

404-
if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) {
404+
if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
405405
tracehook_notify_resume(regs);
406-
if (current->replacement_session_keyring)
407-
key_replace_session_keyring();
408-
}
409406
}

‎arch/mips/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused,
636636
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
637637
clear_thread_flag(TIF_NOTIFY_RESUME);
638638
tracehook_notify_resume(regs);
639-
if (current->replacement_session_keyring)
640-
key_replace_session_keyring();
641639
}
642640
}
643641

‎arch/mn10300/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags)
554554
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
555555
clear_thread_flag(TIF_NOTIFY_RESUME);
556556
tracehook_notify_resume(current_frame());
557-
if (current->replacement_session_keyring)
558-
key_replace_session_keyring();
559557
}
560558
}

‎arch/openrisc/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs)
376376
if (current_thread_info()->flags & _TIF_NOTIFY_RESUME) {
377377
clear_thread_flag(TIF_NOTIFY_RESUME);
378378
tracehook_notify_resume(regs);
379-
if (current->replacement_session_keyring)
380-
key_replace_session_keyring();
381379
}
382380
}

‎arch/parisc/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,5 @@ void do_notify_resume(struct pt_regs *regs, long in_syscall)
638638
if (test_thread_flag(TIF_NOTIFY_RESUME)) {
639639
clear_thread_flag(TIF_NOTIFY_RESUME);
640640
tracehook_notify_resume(regs);
641-
if (current->replacement_session_keyring)
642-
key_replace_session_keyring();
643641
}
644642
}

‎arch/powerpc/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
193193
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
194194
clear_thread_flag(TIF_NOTIFY_RESUME);
195195
tracehook_notify_resume(regs);
196-
if (current->replacement_session_keyring)
197-
key_replace_session_keyring();
198196
}
199197
}
200198

‎arch/s390/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,4 @@ void do_notify_resume(struct pt_regs *regs)
494494
{
495495
clear_thread_flag(TIF_NOTIFY_RESUME);
496496
tracehook_notify_resume(regs);
497-
if (current->replacement_session_keyring)
498-
key_replace_session_keyring();
499497
}

‎arch/score/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused,
356356
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
357357
clear_thread_flag(TIF_NOTIFY_RESUME);
358358
tracehook_notify_resume(regs);
359-
if (current->replacement_session_keyring)
360-
key_replace_session_keyring();
361359
}
362360
}

‎arch/sh/kernel/signal_32.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int save_r0,
626626
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
627627
clear_thread_flag(TIF_NOTIFY_RESUME);
628628
tracehook_notify_resume(regs);
629-
if (current->replacement_session_keyring)
630-
key_replace_session_keyring();
631629
}
632630
}

‎arch/sh/kernel/signal_64.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned long thread_info
685685
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
686686
clear_thread_flag(TIF_NOTIFY_RESUME);
687687
tracehook_notify_resume(regs);
688-
if (current->replacement_session_keyring)
689-
key_replace_session_keyring();
690688
}
691689
}

‎arch/sparc/kernel/signal_32.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,8 +590,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0,
590590
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
591591
clear_thread_flag(TIF_NOTIFY_RESUME);
592592
tracehook_notify_resume(regs);
593-
if (current->replacement_session_keyring)
594-
key_replace_session_keyring();
595593
}
596594
}
597595

‎arch/sparc/kernel/signal_64.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,8 +607,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long
607607
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
608608
clear_thread_flag(TIF_NOTIFY_RESUME);
609609
tracehook_notify_resume(regs);
610-
if (current->replacement_session_keyring)
611-
key_replace_session_keyring();
612610
}
613611
}
614612

‎arch/tile/kernel/process.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,6 @@ int do_work_pending(struct pt_regs *regs, u32 thread_info_flags)
569569
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
570570
clear_thread_flag(TIF_NOTIFY_RESUME);
571571
tracehook_notify_resume(regs);
572-
if (current->replacement_session_keyring)
573-
key_replace_session_keyring();
574572
return 1;
575573
}
576574
if (thread_info_flags & _TIF_SINGLESTEP) {

‎arch/um/kernel/process.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,8 @@ void interrupt_end(void)
117117
schedule();
118118
if (test_thread_flag(TIF_SIGPENDING))
119119
do_signal();
120-
if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) {
120+
if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
121121
tracehook_notify_resume(&current->thread.regs);
122-
if (current->replacement_session_keyring)
123-
key_replace_session_keyring();
124-
}
125122
}
126123

127124
void exit_thread(void)

‎arch/unicore32/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs,
464464
if (thread_flags & _TIF_NOTIFY_RESUME) {
465465
clear_thread_flag(TIF_NOTIFY_RESUME);
466466
tracehook_notify_resume(regs);
467-
if (current->replacement_session_keyring)
468-
key_replace_session_keyring();
469467
}
470468
}
471469

‎arch/x86/kernel/signal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,8 +821,6 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
821821
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
822822
clear_thread_flag(TIF_NOTIFY_RESUME);
823823
tracehook_notify_resume(regs);
824-
if (current->replacement_session_keyring)
825-
key_replace_session_keyring();
826824
}
827825
if (thread_info_flags & _TIF_USER_RETURN_NOTIFY)
828826
fire_user_return_notifiers();

‎arch/xtensa/kernel/signal.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -548,9 +548,6 @@ void do_notify_resume(struct pt_regs *regs)
548548
if (test_thread_flag(TIF_SIGPENDING))
549549
do_signal(regs);
550550

551-
if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) {
551+
if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
552552
tracehook_notify_resume(regs);
553-
if (current->replacement_session_keyring)
554-
key_replace_session_keyring();
555-
}
556553
}

‎include/linux/tracehook.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ static inline void set_notify_resume(struct task_struct *task)
183183
*/
184184
static inline void tracehook_notify_resume(struct pt_regs *regs)
185185
{
186+
if (current->replacement_session_keyring)
187+
key_replace_session_keyring();
186188
}
187189

188190
#endif /* <linux/tracehook.h> */

0 commit comments

Comments
 (0)