diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2015-03-14 05:22:21 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:39 +0100 |
| commit | 57a2e91f726284b567850ffd29ff5456a25d6abb (patch) | |
| tree | 4f70d27d8d4e8862b19eec7adad5840d1a9b2443 /net | |
| parent | 3fe2d645fe4ea7ff6cba9020685e46c1a1dff9c0 (diff) | |
| download | kernel_samsung_smdk4412-57a2e91f726284b567850ffd29ff5456a25d6abb.zip kernel_samsung_smdk4412-57a2e91f726284b567850ffd29ff5456a25d6abb.tar.gz kernel_samsung_smdk4412-57a2e91f726284b567850ffd29ff5456a25d6abb.tar.bz2 | |
caif: fix MSG_OOB test in caif_seqpkt_recvmsg()
[ Upstream commit 3eeff778e00c956875c70b145c52638c313dfb23 ]
It should be checking flags, not msg->msg_flags. It's ->sendmsg()
instances that need to look for that in ->msg_flags, ->recvmsg() ones
(including the other ->recvmsg() instance in that file, as well as
unix_dgram_recvmsg() this one claims to be imitating) check in flags.
Braino had been introduced in commit dcda13 ("caif: Bugfix - use MSG_TRUNC
in receive") back in 2010, so it goes quite a while back.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/caif/caif_socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 7fac75f..7eed9eb 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -317,7 +317,7 @@ static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock, int copylen; ret = -EOPNOTSUPP; - if (m->msg_flags&MSG_OOB) + if (flags & MSG_OOB) goto read_error; skb = skb_recv_datagram(sk, flags, 0 , &ret); |