summaryrefslogtreecommitdiffstats
path: root/net/caif
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2015-03-14 05:22:21 +0000
committerDavid S. Miller <davem@davemloft.net>2015-03-15 22:19:17 -0400
commit3eeff778e00c956875c70b145c52638c313dfb23 (patch)
treedc6a20f9f307944d7d3656d890e197ebbe9399d7 /net/caif
parent4c906c279886550d2aaac6facf71d709158e4e3c (diff)
downloadblackbird-op-linux-3eeff778e00c956875c70b145c52638c313dfb23.tar.gz
blackbird-op-linux-3eeff778e00c956875c70b145c52638c313dfb23.zip
caif: fix MSG_OOB test in caif_seqpkt_recvmsg()
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>
Diffstat (limited to 'net/caif')
-rw-r--r--net/caif/caif_socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index 769b185fefbd..a6e2da0bc718 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -281,7 +281,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);
OpenPOWER on IntegriCloud