Skip to content

Commit 9f30831

Browse files
edumazetkuba-moo
authored andcommitted
net: add rcu safety to rtnl_prop_list_size()
rtnl_prop_list_size() can be called while alternative names are added or removed concurrently. if_nlmsg_size() / rtnl_calcit() can indeed be called without RTNL held. Use explicit RCU protection to avoid UAF. Fixes: 88f4fb0 ("net: rtnetlink: put alternative names to getlink message") Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Jiri Pirko <jiri@nvidia.com> Link: https://lore.kernel.org/r/20240209181248.96637-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 3e36031 commit 9f30831

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

net/core/dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ int netdev_name_node_alt_create(struct net_device *dev, const char *name)
336336
return -ENOMEM;
337337
netdev_name_node_add(net, name_node);
338338
/* The node that holds dev->name acts as a head of per-device list. */
339-
list_add_tail(&name_node->list, &dev->name_node->list);
339+
list_add_tail_rcu(&name_node->list, &dev->name_node->list);
340340

341341
return 0;
342342
}

net/core/rtnetlink.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,14 +1020,17 @@ static size_t rtnl_xdp_size(void)
10201020
static size_t rtnl_prop_list_size(const struct net_device *dev)
10211021
{
10221022
struct netdev_name_node *name_node;
1023-
size_t size;
1023+
unsigned int cnt = 0;
1024+
1025+
rcu_read_lock();
1026+
list_for_each_entry_rcu(name_node, &dev->name_node->list, list)
1027+
cnt++;
1028+
rcu_read_unlock();
10241029

1025-
if (list_empty(&dev->name_node->list))
1030+
if (!cnt)
10261031
return 0;
1027-
size = nla_total_size(0);
1028-
list_for_each_entry(name_node, &dev->name_node->list, list)
1029-
size += nla_total_size(ALTIFNAMSIZ);
1030-
return size;
1032+
1033+
return nla_total_size(0) + cnt * nla_total_size(ALTIFNAMSIZ);
10311034
}
10321035

10331036
static size_t rtnl_proto_down_size(const struct net_device *dev)

0 commit comments

Comments
 (0)