Skip to content

Commit bf4ea58

Browse files
q2venkuba-moo
authored andcommitted
arp: Convert ioctl(SIOCGARP) to RCU.
ioctl(SIOCGARP) holds rtnl_lock() to get netdev by __dev_get_by_name() and copy dev->name safely and calls neigh_lookup() later, which looks up a neighbour entry under RCU. Let's replace __dev_get_by_name() with dev_get_by_name_rcu() and strscpy() with netdev_copy_name() to avoid locking rtnl_lock(). Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Link: https://lore.kernel.org/r/20240430015813.71143-8-kuniyu@amazon.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 0840556 commit bf4ea58

1 file changed

Lines changed: 18 additions & 10 deletions

File tree

net/ipv4/arp.c

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,11 +1003,15 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
10031003
* User level interface (ioctl)
10041004
*/
10051005

1006-
static struct net_device *arp_req_dev_by_name(struct net *net, struct arpreq *r)
1006+
static struct net_device *arp_req_dev_by_name(struct net *net, struct arpreq *r,
1007+
bool getarp)
10071008
{
10081009
struct net_device *dev;
10091010

1010-
dev = __dev_get_by_name(net, r->arp_dev);
1011+
if (getarp)
1012+
dev = dev_get_by_name_rcu(net, r->arp_dev);
1013+
else
1014+
dev = __dev_get_by_name(net, r->arp_dev);
10111015
if (!dev)
10121016
return ERR_PTR(-ENODEV);
10131017

@@ -1028,7 +1032,7 @@ static struct net_device *arp_req_dev(struct net *net, struct arpreq *r)
10281032
__be32 ip;
10291033

10301034
if (r->arp_dev[0])
1031-
return arp_req_dev_by_name(net, r);
1035+
return arp_req_dev_by_name(net, r, false);
10321036

10331037
if (r->arp_flags & ATF_PUBL)
10341038
return NULL;
@@ -1166,7 +1170,7 @@ static int arp_req_get(struct net *net, struct arpreq *r)
11661170
if (!r->arp_dev[0])
11671171
return -ENODEV;
11681172

1169-
dev = arp_req_dev_by_name(net, r);
1173+
dev = arp_req_dev_by_name(net, r, true);
11701174
if (IS_ERR(dev))
11711175
return PTR_ERR(dev);
11721176

@@ -1188,7 +1192,7 @@ static int arp_req_get(struct net *net, struct arpreq *r)
11881192
neigh_release(neigh);
11891193

11901194
r->arp_ha.sa_family = dev->type;
1191-
strscpy(r->arp_dev, dev->name, sizeof(r->arp_dev));
1195+
netdev_copy_name(dev, r->arp_dev);
11921196

11931197
return 0;
11941198
}
@@ -1287,23 +1291,27 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg)
12871291
else if (*netmask && *netmask != htonl(0xFFFFFFFFUL))
12881292
return -EINVAL;
12891293

1290-
rtnl_lock();
1291-
12921294
switch (cmd) {
12931295
case SIOCDARP:
1296+
rtnl_lock();
12941297
err = arp_req_delete(net, &r);
1298+
rtnl_unlock();
12951299
break;
12961300
case SIOCSARP:
1301+
rtnl_lock();
12971302
err = arp_req_set(net, &r);
1303+
rtnl_unlock();
12981304
break;
12991305
case SIOCGARP:
1306+
rcu_read_lock();
13001307
err = arp_req_get(net, &r);
1308+
rcu_read_unlock();
1309+
1310+
if (!err && copy_to_user(arg, &r, sizeof(r)))
1311+
err = -EFAULT;
13011312
break;
13021313
}
13031314

1304-
rtnl_unlock();
1305-
if (cmd == SIOCGARP && !err && copy_to_user(arg, &r, sizeof(r)))
1306-
err = -EFAULT;
13071315
return err;
13081316
}
13091317

0 commit comments

Comments
 (0)