From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D48F3C43219 for ; Tue, 18 Jan 2022 03:02:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352770AbiARDAh (ORCPT ); Mon, 17 Jan 2022 22:00:37 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:58614 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349831AbiARCu2 (ORCPT ); Mon, 17 Jan 2022 21:50:28 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 06305B8124E; Tue, 18 Jan 2022 02:50:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 636C8C36AE3; Tue, 18 Jan 2022 02:50:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642474225; bh=dbUaQiNtbtTcNYZvPSk/yK+SDopfTfCtM8ynIvkfl9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gVnIXjFMIi0jDT9Vyc3/28Ip5F2rXtYxxu0PlLvG0YU38lC6Ewy6RHqT2ydJpbLPz S/DKayPYF3XsIUy0mti8UIdsVZtSg5f7j8Dvy0/PSeUdiytZ9PMo+O+XtUa8r/MMRU sWJxOX8STFiEih9rqTyWq0hNqYW6JU6hRf7YPPAITmBZTHOP/AkMtHeYWjr50CWxp/ WxXLQZ/0fqY8QYDZHIDtjLerjrZ5uRAvjGKJGmpDmR8TdKADdwmgj/oLxltWXO6Yg1 ahiJrI+GW6iDpeerve/iKU+F48z6aSGYnVjfWTXOSyHEeOiPgBil3EhGxrs1FyBo0w 3woEI0OmB2OXA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: xu xin , Zeal Robot , Joanne Koong , "David S . Miller" , Sasha Levin , kuba@kernel.org, daniel@iogearbox.net, dsahern@kernel.org, edumazet@google.com, yajun.deng@linux.dev, chinagar@codeaurora.org, roopa@nvidia.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 30/56] net: Enable neighbor sysctls that is save for userns root Date: Mon, 17 Jan 2022 21:48:42 -0500 Message-Id: <20220118024908.1953673-30-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118024908.1953673-1-sashal@kernel.org> References: <20220118024908.1953673-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: xu xin [ Upstream commit 8c8b7aa7fb0cf9e1cc9204e6bc6e1353b8393502 ] Inside netns owned by non-init userns, sysctls about ARP/neighbor is currently not visible and configurable. For the attributes these sysctls correspond to, any modifications make effects on the performance of networking(ARP, especilly) only in the scope of netns, which does not affect other netns. Actually, some tools via netlink can modify these attribute. iproute2 is an example. see as follows: $ unshare -ur -n $ cat /proc/sys/net/ipv4/neigh/lo/retrans_time cat: can't open '/proc/sys/net/ipv4/neigh/lo/retrans_time': No such file or directory $ ip ntable show dev lo inet arp_cache dev lo refcnt 1 reachable 19494 base_reachable 30000 retrans 1000 gc_stale 60000 delay_probe 5000 queue 101 app_probes 0 ucast_probes 3 mcast_probes 3 anycast_delay 1000 proxy_delay 800 proxy_queue 64 locktime 1000 inet6 ndisc_cache dev lo refcnt 1 reachable 42394 base_reachable 30000 retrans 1000 gc_stale 60000 delay_probe 5000 queue 101 app_probes 0 ucast_probes 3 mcast_probes 3 anycast_delay 1000 proxy_delay 800 proxy_queue 64 locktime 0 $ ip ntable change name arp_cache dev retrans 2000 inet arp_cache dev lo refcnt 1 reachable 22917 base_reachable 30000 retrans 2000 gc_stale 60000 delay_probe 5000 queue 101 app_probes 0 ucast_probes 3 mcast_probes 3 anycast_delay 1000 proxy_delay 800 proxy_queue 64 locktime 1000 inet6 ndisc_cache dev lo refcnt 1 reachable 35524 base_reachable 30000 retrans 1000 gc_stale 60000 delay_probe 5000 queue 101 app_probes 0 ucast_probes 3 mcast_probes 3 anycast_delay 1000 proxy_delay 800 proxy_queue 64 locktime 0 Reported-by: Zeal Robot Signed-off-by: xu xin Acked-by: Joanne Koong Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/neighbour.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 358e84af0210b..48bd9f4002b4e 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -3251,10 +3251,6 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, neigh_proc_base_reachable_time; } - /* Don't export sysctls to unprivileged users */ - if (neigh_parms_net(p)->user_ns != &init_user_ns) - t->neigh_vars[0].procname = NULL; - switch (neigh_parms_family(p)) { case AF_INET: p_name = "ipv4"; -- 2.34.1