summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-05-24 17:58:08 -0600
committerEric W. Biederman <ebiederm@xmission.com>2012-08-14 21:55:20 -0700
commitd06ca9564350184a19b5aae9ac150f1b1306de29 (patch)
treea6f5e39232911fe0582690f223390997a84f0b86 /init
parentc336d148adc4181f31741ae066df41429be64b67 (diff)
downloadlinux-stable-d06ca9564350184a19b5aae9ac150f1b1306de29.tar.gz
linux-stable-d06ca9564350184a19b5aae9ac150f1b1306de29.tar.bz2
linux-stable-d06ca9564350184a19b5aae9ac150f1b1306de29.zip
userns: Teach inet_diag to work with user namespaces
Compute the user namespace of the socket that we are replying to and translate the kuids of reported sockets into that user namespace. Cc: Andrew Vagin <avagin@openvz.org> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Pavel Emelyanov <xemul@parallels.com> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 8447e0ca4186..07435e0c3a4b 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -950,7 +950,6 @@ config UIDGID_CONVERTED
depends on NETFILTER_NETLINK_LOG = n
depends on AF_RXRPC = n
depends on NET_KEY = n
- depends on INET_DIAG = n
depends on DNS_RESOLVER = n
# Filesystems