From: Bart Van Assche Date: Wed, 25 Feb 2026 18:32:42 +0000 (-0800) Subject: signal: Fix the lock_task_sighand() annotation X-Git-Tag: v7.1-rc1~199^2~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39be7b21af24d1d2ed3b18caac57dd219fef226e;p=thirdparty%2Fkernel%2Flinux.git signal: Fix the lock_task_sighand() annotation lock_task_sighand() may return NULL. Make this clear in its lock context annotation. Fixes: 04e49d926f43 ("sched: Enable context analysis for core.c and fair.c") Signed-off-by: Bart Van Assche Signed-off-by: Peter Zijlstra (Intel) Acked-by: Marco Elver Link: https://patch.msgid.link/20260225183244.4035378-3-bvanassche@acm.org --- diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h index a22248aebcf90..a4835a7de07ee 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -739,7 +739,7 @@ static inline int thread_group_empty(struct task_struct *p) extern struct sighand_struct *lock_task_sighand(struct task_struct *task, unsigned long *flags) - __acquires(&task->sighand->siglock); + __cond_acquires(nonnull, &task->sighand->siglock); static inline void unlock_task_sighand(struct task_struct *task, unsigned long *flags)