Commit 57a2e91f authored by Al Viro's avatar Al Viro Committed by Ben Hutchings

caif: fix MSG_OOB test in caif_seqpkt_recvmsg()

[ Upstream commit 3eeff778 ]

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 3fe2d645
...@@ -317,7 +317,7 @@ static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock, ...@@ -317,7 +317,7 @@ static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock,
int copylen; int copylen;
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
if (m->msg_flags&MSG_OOB) if (flags & MSG_OOB)
goto read_error; goto read_error;
skb = skb_recv_datagram(sk, flags, 0 , &ret); skb = skb_recv_datagram(sk, flags, 0 , &ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment