diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-01-13 16:20:59 +0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-01-13 16:20:59 +0300 |
commit | 1aa77e716c6f2332f2d4664f747ff4eba731825b (patch) | |
tree | bffb043cec73da6c79d4ec652e531f86344b160b /net/unix/sysctl_net_unix.c | |
parent | c0dd94558d0e473aa92254e1c48a47900c911e69 (diff) | |
parent | 455e73a07f6e288b0061dfcf4fcf54fa9fe06458 (diff) | |
download | linux-1aa77e716c6f2332f2d4664f747ff4eba731825b.tar.xz |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and get in line with other trees, powerpc kernel
mostly this time, but BPF as well.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
-rw-r--r-- | net/unix/sysctl_net_unix.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index c09bea89151b..01d44e2598e2 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c @@ -30,10 +30,6 @@ int __net_init unix_sysctl_register(struct net *net) if (table == NULL) goto err_alloc; - /* Don't export sysctls to unprivileged users */ - if (net->user_ns != &init_user_ns) - table[0].procname = NULL; - table[0].data = &net->unx.sysctl_max_dgram_qlen; net->unx.ctl = register_net_sysctl(net, "net/unix", table); if (net->unx.ctl == NULL) |