Merge 4.4.148 into android-4.4-p

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 09d6c4a..395d827 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -438,6 +438,19 @@ config INET_UDP_DIAG
          Support for UDP socket monitoring interface used by the ss tool.
          If unsure, say Y.
 
+config INET_DIAG_DESTROY
+       bool "INET: allow privileged process to administratively close sockets"
+       depends on INET_DIAG
+       default n
+       ---help---
+         Provides a SOCK_DESTROY operation that allows privileged processes
+         (e.g., a connection manager or a network administration tool such as
+         ss) to close sockets opened by other processes. Closing a socket in
+         this way interrupts any blocking read/write/connect operations on
+         the socket and causes future socket calls to behave as if the socket
+         had been disconnected.
+         If unsure, say N.
+
 menuconfig TCP_CONG_ADVANCED
        bool "TCP: advanced congestion control"
        ---help---