Skip to content

Commit 6b4be64

Browse files
Jianbo Liukuba-moo
authored andcommitted
net/mlx5e: Harden uplink netdev access against device unbind
The function mlx5_uplink_netdev_get() gets the uplink netdevice pointer from mdev->mlx5e_res.uplink_netdev. However, the netdevice can be removed and its pointer cleared when unbound from the mlx5_core.eth driver. This results in a NULL pointer, causing a kernel panic. BUG: unable to handle page fault for address: 0000000000001300 at RIP: 0010:mlx5e_vport_rep_load+0x22a/0x270 [mlx5_core] Call Trace: <TASK> mlx5_esw_offloads_rep_load+0x68/0xe0 [mlx5_core] esw_offloads_enable+0x593/0x910 [mlx5_core] mlx5_eswitch_enable_locked+0x341/0x420 [mlx5_core] mlx5_devlink_eswitch_mode_set+0x17e/0x3a0 [mlx5_core] devlink_nl_eswitch_set_doit+0x60/0xd0 genl_family_rcv_msg_doit+0xe0/0x130 genl_rcv_msg+0x183/0x290 netlink_rcv_skb+0x4b/0xf0 genl_rcv+0x24/0x40 netlink_unicast+0x255/0x380 netlink_sendmsg+0x1f3/0x420 __sock_sendmsg+0x38/0x60 __sys_sendto+0x119/0x180 do_syscall_64+0x53/0x1d0 entry_SYSCALL_64_after_hwframe+0x4b/0x53 Ensure the pointer is valid before use by checking it for NULL. If it is valid, immediately call netdev_hold() to take a reference, and preventing the netdevice from being freed while it is in use. Fixes: 7a9fb35 ("net/mlx5e: Do not reload ethernet ports when changing eswitch mode") Signed-off-by: Jianbo Liu <jianbol@nvidia.com> Reviewed-by: Cosmin Ratiu <cratiu@nvidia.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com> Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> Link: https://patch.msgid.link/1757939074-617281-2-git-send-email-tariqt@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 94ff1ed commit 6b4be64

File tree

4 files changed

+38
-6
lines changed

4 files changed

+38
-6
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,12 +1506,21 @@ static const struct mlx5e_profile mlx5e_uplink_rep_profile = {
15061506
static int
15071507
mlx5e_vport_uplink_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)
15081508
{
1509-
struct mlx5e_priv *priv = netdev_priv(mlx5_uplink_netdev_get(dev));
15101509
struct mlx5e_rep_priv *rpriv = mlx5e_rep_to_rep_priv(rep);
1510+
struct net_device *netdev;
1511+
struct mlx5e_priv *priv;
1512+
int err;
1513+
1514+
netdev = mlx5_uplink_netdev_get(dev);
1515+
if (!netdev)
1516+
return 0;
15111517

1518+
priv = netdev_priv(netdev);
15121519
rpriv->netdev = priv->netdev;
1513-
return mlx5e_netdev_change_profile(priv, &mlx5e_uplink_rep_profile,
1514-
rpriv);
1520+
err = mlx5e_netdev_change_profile(priv, &mlx5e_uplink_rep_profile,
1521+
rpriv);
1522+
mlx5_uplink_netdev_put(dev, netdev);
1523+
return err;
15151524
}
15161525

15171526
static void
@@ -1638,8 +1647,16 @@ mlx5e_vport_rep_unload(struct mlx5_eswitch_rep *rep)
16381647
{
16391648
struct mlx5e_rep_priv *rpriv = mlx5e_rep_to_rep_priv(rep);
16401649
struct net_device *netdev = rpriv->netdev;
1641-
struct mlx5e_priv *priv = netdev_priv(netdev);
1642-
void *ppriv = priv->ppriv;
1650+
struct mlx5e_priv *priv;
1651+
void *ppriv;
1652+
1653+
if (!netdev) {
1654+
ppriv = rpriv;
1655+
goto free_ppriv;
1656+
}
1657+
1658+
priv = netdev_priv(netdev);
1659+
ppriv = priv->ppriv;
16431660

16441661
if (rep->vport == MLX5_VPORT_UPLINK) {
16451662
mlx5e_vport_uplink_rep_unload(rpriv);

drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,6 +1515,7 @@ static u32 mlx5_esw_qos_lag_link_speed_get_locked(struct mlx5_core_dev *mdev)
15151515
speed = lksettings.base.speed;
15161516

15171517
out:
1518+
mlx5_uplink_netdev_put(mdev, slave);
15181519
return speed;
15191520
}
15201521

drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,20 @@ int mlx5_crdump_collect(struct mlx5_core_dev *dev, u32 *cr_data);
4747

4848
static inline struct net_device *mlx5_uplink_netdev_get(struct mlx5_core_dev *mdev)
4949
{
50-
return mdev->mlx5e_res.uplink_netdev;
50+
struct mlx5e_resources *mlx5e_res = &mdev->mlx5e_res;
51+
struct net_device *netdev;
52+
53+
mutex_lock(&mlx5e_res->uplink_netdev_lock);
54+
netdev = mlx5e_res->uplink_netdev;
55+
netdev_hold(netdev, &mlx5e_res->tracker, GFP_KERNEL);
56+
mutex_unlock(&mlx5e_res->uplink_netdev_lock);
57+
return netdev;
58+
}
59+
60+
static inline void mlx5_uplink_netdev_put(struct mlx5_core_dev *mdev,
61+
struct net_device *netdev)
62+
{
63+
netdev_put(netdev, &mdev->mlx5e_res.tracker);
5164
}
5265

5366
struct mlx5_sd;

include/linux/mlx5/driver.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,7 @@ struct mlx5e_resources {
663663
bool tisn_valid;
664664
} hw_objs;
665665
struct net_device *uplink_netdev;
666+
netdevice_tracker tracker;
666667
struct mutex uplink_netdev_lock;
667668
struct mlx5_crypto_dek_priv *dek_priv;
668669
};

0 commit comments

Comments
 (0)