lkml.org 
[lkml]   [2015]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 160/165] rxrpc: bogus MSG_PEEK test in rxrpc_recvmsg()
    Date
    3.16.7-ckt9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Al Viro <viro@ZenIV.linux.org.uk>

    commit 7d985ed1dca5c90535d67ce92ef6ca520302340a upstream.

    [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>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/rxrpc/ar-recvmsg.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/rxrpc/ar-recvmsg.c b/net/rxrpc/ar-recvmsg.c
    index e9aaa65c0778..0df95463c650 100644
    --- a/net/rxrpc/ar-recvmsg.c
    +++ b/net/rxrpc/ar-recvmsg.c
    @@ -87,7 +87,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,
    if (!skb) {
    /* nothing remains on the queue */
    if (copied &&
    - (msg->msg_flags & MSG_PEEK || timeo == 0))
    + (flags & MSG_PEEK || timeo == 0))
    goto out;

    /* wait for a message to turn up */

    \
     
     \ /
      Last update: 2015-03-25 15:41    [W:4.206 / U:0.708 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site