]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
caif: fix MSG_OOB test in caif_seqpkt_recvmsg()
authorAl Viro <viro@ZenIV.linux.org.uk>
Sat, 14 Mar 2015 05:22:21 +0000 (05:22 +0000)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 24 Mar 2015 10:30:02 +0000 (10:30 +0000)
commit 3eeff778e00c956875c70b145c52638c313dfb23 upstream.

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: Luis Henriques <luis.henriques@canonical.com>
net/caif/caif_socket.c

index e8437094d15fc8a7aa342969f9c6ebd7afeb740a..5e078a0b24554c164667ea49ac360d45b6e2b8ad 100644 (file)
@@ -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);