lkml.org 
[lkml]   [2016]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.6 10/31] sock_diag: do not broadcast raw socket destruction
    Date
    4.6-stable review patch.  If anyone has any objections, please let me know.

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

    From: Willem de Bruijn <willemb@google.com>

    [ Upstream commit 9a0fee2b552b1235fb1706ae1fc664ae74573be8 ]

    Diag intends to broadcast tcp_sk and udp_sk socket destruction.
    Testing sk->sk_protocol for IPPROTO_TCP/IPPROTO_UDP alone is not
    sufficient for this. Raw sockets can have the same type.

    Add a test for sk->sk_type.

    Fixes: eb4cb008529c ("sock_diag: define destruction multicast groups")
    Signed-off-by: Willem de Bruijn <willemb@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/linux/sock_diag.h | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/include/linux/sock_diag.h
    +++ b/include/linux/sock_diag.h
    @@ -36,6 +36,9 @@ enum sknetlink_groups sock_diag_destroy_
    {
    switch (sk->sk_family) {
    case AF_INET:
    + if (sk->sk_type == SOCK_RAW)
    + return SKNLGRP_NONE;
    +
    switch (sk->sk_protocol) {
    case IPPROTO_TCP:
    return SKNLGRP_INET_TCP_DESTROY;
    @@ -45,6 +48,9 @@ enum sknetlink_groups sock_diag_destroy_
    return SKNLGRP_NONE;
    }
    case AF_INET6:
    + if (sk->sk_type == SOCK_RAW)
    + return SKNLGRP_NONE;
    +
    switch (sk->sk_protocol) {
    case IPPROTO_TCP:
    return SKNLGRP_INET6_TCP_DESTROY;

    \
     
     \ /
      Last update: 2016-07-07 04:21    [W:2.881 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site