diff options
| author | David S. Miller <[email protected]> | 2014-03-26 00:29:20 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2014-03-26 00:29:20 +0000 |
| commit | 04f58c88542b6b351efb4eea01134eb672e22e6e (patch) | |
| tree | 47bb617212f8c8951f35730e324bdc43487a01ca /ipc/msg.c | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| parent | Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | kernel-04f58c88542b6b351efb4eea01134eb672e22e6e.tar.gz kernel-04f58c88542b6b351efb4eea01134eb672e22e6e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/devicetree/bindings/net/micrel-ks8851.txt
net/core/netpoll.c
The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.
In micrel-ks8851.txt we simply have overlapping changes.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'ipc/msg.c')
| -rw-r--r-- | ipc/msg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index 245db1140ad6..649853105a5d 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -901,6 +901,8 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl 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)); if (IS_ERR(copy)) return PTR_ERR(copy); |