diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2015-03-14 08:22:21 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-03-24 13:30:02 +0300 |
| commit | d4f6eec0152b60cf2c0cb05801fddd0e5767f3a5 (patch) | |
| tree | bd9404c8f8b181f86c6dec00b33c630eddcb9d8e | |
| parent | 1bfe6c38372b2a2a287ab3e558fc02b9c5ac33ec (diff) | |
| download | linux-d4f6eec0152b60cf2c0cb05801fddd0e5767f3a5.tar.xz | |
caif: fix MSG_OOB test in caif_seqpkt_recvmsg()
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>
| -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 e8437094d15f..5e078a0b2455 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); |