Skip to content

Commit 844f104

Browse files
vladimirolteankuba-moo
authored andcommitted
net: dsa: fix netdev_priv() dereference before check on non-DSA netdevice events
After the blamed commit, we started doing this dereference for every NETDEV_CHANGEUPPER and NETDEV_PRECHANGEUPPER event in the system. static inline struct dsa_port *dsa_user_to_port(const struct net_device *dev) { struct dsa_user_priv *p = netdev_priv(dev); return p->dp; } Which is obviously bogus, because not all net_devices have a netdev_priv() of type struct dsa_user_priv. But struct dsa_user_priv is fairly small, and p->dp means dereferencing 8 bytes starting with offset 16. Most drivers allocate that much private memory anyway, making our access not fault, and we discard the bogus data quickly afterwards, so this wasn't caught. But the dummy interface is somewhat special in that it calls alloc_netdev() with a priv size of 0. So every netdev_priv() dereference is invalid, and we get this when we emit a NETDEV_PRECHANGEUPPER event with a VLAN as its new upper: $ ip link add dummy1 type dummy $ ip link add link dummy1 name dummy1.100 type vlan id 100 [ 43.309174] ================================================================== [ 43.316456] BUG: KASAN: slab-out-of-bounds in dsa_user_prechangeupper+0x30/0xe8 [ 43.323835] Read of size 8 at addr ffff3f86481d2990 by task ip/374 [ 43.330058] [ 43.342436] Call trace: [ 43.366542] dsa_user_prechangeupper+0x30/0xe8 [ 43.371024] dsa_user_netdevice_event+0xb38/0xee8 [ 43.375768] notifier_call_chain+0xa4/0x210 [ 43.379985] raw_notifier_call_chain+0x24/0x38 [ 43.384464] __netdev_upper_dev_link+0x3ec/0x5d8 [ 43.389120] netdev_upper_dev_link+0x70/0xa8 [ 43.393424] register_vlan_dev+0x1bc/0x310 [ 43.397554] vlan_newlink+0x210/0x248 [ 43.401247] rtnl_newlink+0x9fc/0xe30 [ 43.404942] rtnetlink_rcv_msg+0x378/0x580 Avoid the kernel oops by dereferencing after the type check, as customary. Fixes: 4c3f80d ("net: dsa: walk through all changeupper notifier functions") Reported-and-tested-by: syzbot+d81bcd883824180500c8@syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/0000000000001d4255060e87545c@google.com/ Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://lore.kernel.org/r/20240110003354.2796778-1-vladimir.oltean@nxp.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent b33fb5b commit 844f104

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

net/dsa/user.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2806,13 +2806,14 @@ EXPORT_SYMBOL_GPL(dsa_user_dev_check);
28062806
static int dsa_user_changeupper(struct net_device *dev,
28072807
struct netdev_notifier_changeupper_info *info)
28082808
{
2809-
struct dsa_port *dp = dsa_user_to_port(dev);
28102809
struct netlink_ext_ack *extack;
28112810
int err = NOTIFY_DONE;
2811+
struct dsa_port *dp;
28122812

28132813
if (!dsa_user_dev_check(dev))
28142814
return err;
28152815

2816+
dp = dsa_user_to_port(dev);
28162817
extack = netdev_notifier_info_to_extack(&info->info);
28172818

28182819
if (netif_is_bridge_master(info->upper_dev)) {
@@ -2865,11 +2866,13 @@ static int dsa_user_changeupper(struct net_device *dev,
28652866
static int dsa_user_prechangeupper(struct net_device *dev,
28662867
struct netdev_notifier_changeupper_info *info)
28672868
{
2868-
struct dsa_port *dp = dsa_user_to_port(dev);
2869+
struct dsa_port *dp;
28692870

28702871
if (!dsa_user_dev_check(dev))
28712872
return NOTIFY_DONE;
28722873

2874+
dp = dsa_user_to_port(dev);
2875+
28732876
if (netif_is_bridge_master(info->upper_dev) && !info->linking)
28742877
dsa_port_pre_bridge_leave(dp, info->upper_dev);
28752878
else if (netif_is_lag_master(info->upper_dev) && !info->linking)

0 commit comments

Comments
 (0)