Commit cb3c19c9 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal: Use lockdep_assert_held instead of assert_spin_locked 



The distinction is that assert_spin_locked() checks if the lock is
held *by*anyone* whereas lockdep_assert_held() asserts the current
context holds the lock.  Also, the check goes away if you build
without lockdep.

Suggested-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/r/Ympr/+PX4XgT/UKU@hirez.programming.kicks-ass.net


Tested-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarOleg Nesterov <oleg@redhat.com>
Link: https://lkml.kernel.org/r/20220505182645.497868-6-ebiederm@xmission.com


Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 16cc1bc6

kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ static int check_kill_permission(int sig, struct kernel_siginfo *info, 
static void ptrace_trap_notify(struct task_struct *t)

{

	WARN_ON_ONCE(!(t->ptrace & PT_SEIZED));

	assert_spin_locked(&t->sighand->siglock);

	lockdep_assert_held(&t->sighand->siglock);



	task_set_jobctl_pending(t, JOBCTL_TRAP_NOTIFY);

	ptrace_signal_wake_up(t, t->jobctl & JOBCTL_LISTENING);
@@ -1079,7 +1079,7 @@ static int __send_signal_locked(int sig, struct kernel_siginfo *info, 
	int override_rlimit;

	int ret = 0, result;



	assert_spin_locked(&t->sighand->siglock);

	lockdep_assert_held(&t->sighand->siglock);



	result = TRACE_SIGNAL_IGNORED;

	if (!prepare_signal(sig, t, force))