Skip to contentSkip to conversation

Patch "sock_diag: do not broadcast raw socket destruction" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message Jul 6, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

sock_diag: do not broadcast raw socket destruction

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
sock_diag-do-not-broadcast-raw-socket-destruction.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Wed Jul 6 16:50:56 PDT 2016

From: Willem de Bruijn <[email protected]>
Date: Fri, 24 Jun 2016 16:02:35 -0400
Subject: sock_diag: do not broadcast raw socket destruction

From: Willem de Bruijn <[email protected]>

[ 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")
---
 include/linux/sock_diag.h |    6 ++++++
 1 file changed, 6 insertions(+)
include/linux/sock_diag.h +6 -0
@@ -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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/sock_diag-do-not-broadcast-raw-socket-destruction.patch