2017-01-27 13:32:10 +00:00
|
|
|
--- a/net/Kconfig
|
|
|
|
|
+++ b/net/Kconfig
|
|
|
|
|
@@ -95,6 +95,9 @@ source "net/netlabel/Kconfig"
|
|
|
|
|
|
|
|
|
|
endif # if INET
|
|
|
|
|
|
|
|
|
|
+config SOCK_DIAG
|
|
|
|
|
+ bool
|
|
|
|
|
+
|
|
|
|
|
config NETWORK_SECMARK
|
|
|
|
|
bool "Security Marking"
|
|
|
|
|
help
|
|
|
|
|
--- a/net/core/Makefile
|
|
|
|
|
+++ b/net/core/Makefile
|
|
|
|
|
@@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.
|
|
|
|
|
|
|
|
|
|
obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
|
|
|
|
|
neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
|
|
|
|
|
- sock_diag.o dev_ioctl.o tso.o sock_reuseport.o
|
|
|
|
|
+ dev_ioctl.o tso.o sock_reuseport.o
|
|
|
|
|
|
|
|
|
|
+obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
|
|
|
|
|
obj-$(CONFIG_XFRM) += flow.o
|
|
|
|
|
obj-y += net-sysfs.o
|
|
|
|
|
obj-$(CONFIG_PROC_FS) += net-procfs.o
|
|
|
|
|
--- a/net/core/sock.c
|
|
|
|
|
+++ b/net/core/sock.c
|
2017-04-02 08:29:55 +00:00
|
|
|
@@ -1460,9 +1460,11 @@ void sk_destruct(struct sock *sk)
|
2017-01-27 13:32:10 +00:00
|
|
|
|
|
|
|
|
static void __sk_free(struct sock *sk)
|
|
|
|
|
{
|
|
|
|
|
+#ifdef CONFIG_SOCK_DIAG
|
|
|
|
|
if (unlikely(sock_diag_has_destroy_listeners(sk) && sk->sk_net_refcnt))
|
|
|
|
|
sock_diag_broadcast_destroy(sk);
|
|
|
|
|
else
|
|
|
|
|
+#endif
|
|
|
|
|
sk_destruct(sk);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
--- a/net/ipv4/Kconfig
|
|
|
|
|
+++ b/net/ipv4/Kconfig
|
|
|
|
|
@@ -408,6 +408,7 @@ config INET_XFRM_MODE_BEET
|
|
|
|
|
|
|
|
|
|
config INET_DIAG
|
|
|
|
|
tristate "INET: socket monitoring interface"
|
|
|
|
|
+ select SOCK_DIAG
|
|
|
|
|
default y
|
|
|
|
|
---help---
|
|
|
|
|
Support for INET (TCP, DCCP, etc) socket monitoring interface used by
|
|
|
|
|
--- a/net/unix/Kconfig
|
|
|
|
|
+++ b/net/unix/Kconfig
|
|
|
|
|
@@ -22,6 +22,7 @@ config UNIX
|
|
|
|
|
config UNIX_DIAG
|
|
|
|
|
tristate "UNIX: socket monitoring interface"
|
|
|
|
|
depends on UNIX
|
|
|
|
|
+ select SOCK_DIAG
|
|
|
|
|
default n
|
|
|
|
|
---help---
|
|
|
|
|
Support for UNIX socket monitoring interface used by the ss tool.
|
|
|
|
|
--- a/net/netlink/Kconfig
|
|
|
|
|
+++ b/net/netlink/Kconfig
|
|
|
|
|
@@ -4,6 +4,7 @@
|
|
|
|
|
|
|
|
|
|
config NETLINK_DIAG
|
|
|
|
|
tristate "NETLINK: socket monitoring interface"
|
|
|
|
|
+ select SOCK_DIAG
|
|
|
|
|
default n
|
|
|
|
|
---help---
|
|
|
|
|
Support for NETLINK socket monitoring interface used by the ss tool.
|
|
|
|
|
--- a/net/packet/Kconfig
|
|
|
|
|
+++ b/net/packet/Kconfig
|
|
|
|
|
@@ -18,6 +18,7 @@ config PACKET
|
|
|
|
|
config PACKET_DIAG
|
|
|
|
|
tristate "Packet: sockets monitoring interface"
|
|
|
|
|
depends on PACKET
|
|
|
|
|
+ select SOCK_DIAG
|
|
|
|
|
default n
|
|
|
|
|
---help---
|
|
|
|
|
Support for PF_PACKET sockets monitoring interface used by the ss tool.
|
