lkml.org 
[lkml]   [2015]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 10/55] caif: fix MSG_OOB test in caif_seqpkt_recvmsg()
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

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

    [ Upstream commit 3eeff778e00c956875c70b145c52638c313dfb23 ]

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/caif/caif_socket.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/caif/caif_socket.c
    +++ b/net/caif/caif_socket.c
    @@ -283,7 +283,7 @@ static int caif_seqpkt_recvmsg(struct ki
    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);



    \
     
     \ /
      Last update: 2015-03-24 17:01    [W:4.100 / U:0.524 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site