| From foo@baz Wed Jul 6 16:50:56 PDT 2016 |
| From: Willem de Bruijn <willemb@google.com> |
| Date: Fri, 24 Jun 2016 16:02:35 -0400 |
| Subject: sock_diag: do not broadcast raw socket destruction |
| |
| 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; |