From: Kuniyuki Iwashima Date: Tue, 11 Feb 2025 04:50:57 +0000 (+0900) Subject: arp: Convert SIOCDARP and SIOCSARP to per-netns RTNL. X-Git-Tag: v6.15-rc1~160^2~332 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7aca0d8a727da503a8adeb6866a136ded5bea4b1;p=thirdparty%2Fkernel%2Flinux.git arp: Convert SIOCDARP and SIOCSARP to per-netns RTNL. ioctl(SIOCDARP/SIOCSARP) operates on a single netns fetched from an AF_INET socket in inet_ioctl(). Let's hold rtnl_net_lock() for SIOCDARP and SIOCSARP. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/20250211045057.10419-1-kuniyu@amazon.com Signed-off-by: Paolo Abeni --- diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index cb9a7ed8abd3a..431d900c136c4 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -1062,8 +1062,8 @@ static int arp_req_set_proxy(struct net *net, struct net_device *dev, int on) IPV4_DEVCONF_ALL(net, PROXY_ARP) = on; return 0; } - if (__in_dev_get_rtnl(dev)) { - IN_DEV_CONF_SET(__in_dev_get_rtnl(dev), PROXY_ARP, on); + if (__in_dev_get_rtnl_net(dev)) { + IN_DEV_CONF_SET(__in_dev_get_rtnl_net(dev), PROXY_ARP, on); return 0; } return -ENXIO; @@ -1293,14 +1293,14 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg) switch (cmd) { case SIOCDARP: - rtnl_lock(); + rtnl_net_lock(net); err = arp_req_delete(net, &r); - rtnl_unlock(); + rtnl_net_unlock(net); break; case SIOCSARP: - rtnl_lock(); + rtnl_net_lock(net); err = arp_req_set(net, &r); - rtnl_unlock(); + rtnl_net_unlock(net); break; case SIOCGARP: rcu_read_lock();