Commit 3eeff778 authored Mar 14, 2015 by Al Viro Committed by David S. Miller Mar 15, 2015

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>

parent 4c906c27

net/caif/caif_socket.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message