Message ID | 1396368519-12728-76-git-send-email-kamal@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/ipc/msg.c b/ipc/msg.c index fede1d0..5fa44c9 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -825,6 +825,8 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, if (msqid < 0 || (long) bufsz < 0) return -EINVAL; if (msgflg & MSG_COPY) { + if ((msgflg & MSG_EXCEPT) || !(msgflg & IPC_NOWAIT)) + return -EINVAL; copy = prepare_copy(buf, min_t(size_t, bufsz, ns->msg_ctlmax), msgflg, &msgtyp, ©_number); if (IS_ERR(copy))