Merge /spare/repo/linux-2.6/

[linux-2.6.git] / ipc / mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 33f71520b89c55610b6fb34b2834a5b061efa6c1..0acf245f441d6640cbf8739211bb19dfd51e9d8c 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -23,6 +23,7 @@
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/syscalls.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/syscalls.h>

+#include <linux/signal.h>

 #include <net/sock.h>
 #include "util.h"
 
 #include <net/sock.h>
 #include "util.h"
 


@@ -976,8 +977,7 @@ asmlinkage long sys_mq_notify(mqd_t mqdes,
                             notification.sigev_notify != SIGEV_THREAD))
                        return -EINVAL;
                if (notification.sigev_notify == SIGEV_SIGNAL &&
                             notification.sigev_notify != SIGEV_THREAD))
                        return -EINVAL;
                if (notification.sigev_notify == SIGEV_SIGNAL &&

-                       (notification.sigev_signo < 0 ||
-                        notification.sigev_signo > _NSIG)) {
+                       !valid_signal(notification.sigev_signo)) {

                        return -EINVAL;
                }
                if (notification.sigev_notify == SIGEV_THREAD) {
                        return -EINVAL;
                }
                if (notification.sigev_notify == SIGEV_THREAD) {