summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Brauner <brauner@kernel.org>2026-08-12 16:26:45 +0200
committerChristian Brauner <brauner@kernel.org>2026-08-12 16:26:45 +0200
commitbb25427e57b0fd091c2eecc3c699cd257a1cda40 (patch)
tree27e627def7f7edbe55615567be1ff6d76fbe3cd1
parentd8f22ed1532c48f48402588c16f3c1ddb4840ca1 (diff)
parent1184f5e8200902cae3e098ac68d8600ecdf6fe28 (diff)
downloadlinux-next-bb25427e57b0fd091c2eecc3c699cd257a1cda40.tar.gz
linux-next-bb25427e57b0fd091c2eecc3c699cd257a1cda40.zip
Merge branch 'ipc-7.3.misc' into vfs.all
Signed-off-by: Christian Brauner <brauner@kernel.org>
-rw-r--r--ipc/mqueue.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 4798b375972b..fa0b02c68cf1 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -790,7 +790,6 @@ static void __do_notify(struct mqueue_inode_info *info)
struct kernel_siginfo sig_i;
struct task_struct *task;
- /* do_mq_notify() accepts sigev_signo == 0, why?? */
if (!info->notify.sigev_signo)
break;
@@ -1281,9 +1280,9 @@ static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)
notification->sigev_notify != SIGEV_THREAD))
return -EINVAL;
if (notification->sigev_notify == SIGEV_SIGNAL &&
- !valid_signal(notification->sigev_signo)) {
+ (!notification->sigev_signo ||
+ !valid_signal(notification->sigev_signo)))
return -EINVAL;
- }
if (notification->sigev_notify == SIGEV_THREAD) {
long timeo;