Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rxrpc: bogus MSG_PEEK test in rxrpc_recvmsg()

Browse source 
[I would really like an ACK on that one from dhowells; it appears to be
quite straightforward, but...]

MSG_PEEK isn't passed to ->recvmsg() via msg->msg_flags; as the matter of
fact, neither the kernel users of rxrpc, nor the syscalls ever set that bit
in there.  It gets passed via flags; in fact, another such check in the same
function is done correctly - as flags & MSG_PEEK.

It had been that way (effectively disabled) for 8 years, though, so the patch
needs beating up - that case had never been tested.  If it is correct, it's
-stable fodder.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro 2015-03-14 05:34:56 +00:00 committed by David S. Miller
parent 3eeff778e0
commit 7d985ed1dc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/rxrpc/ar-recvmsg.c
View file

@ -87,7 +87,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,
if (!skb) { if (!skb) {
/* nothing remains on the queue */ /* nothing remains on the queue */
if (copied && if (copied &&
(msg->msg_flags & MSG_PEEK || timeo == 0)) (flags & MSG_PEEK || timeo == 0))
goto out; goto out;
/* wait for a message to turn up */ /* wait for a message to turn up */