diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-10-30 16:15:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-01 13:29:41 +0000 |
| commit | 26c37d89f61d84dda55feefeafb4907f2a7cd944 (patch) | |
| tree | f74f0aacd8288855cdcbc2a3fba5739f0892d682 /drivers/net/netdevsim | |
| parent | 1adc58ea2330cd014fde8a254480441e10ee280d (diff) | |
netdevsim: take rtnl_lock when assigning num_vfs
Legacy VF NDOs look at num_vfs and then based on that
index into vfconfig. If we don't rtnl_lock() num_vfs
may get set to 0 and vfconfig freed/replaced while
the NDO is running.
We don't need to protect replacing vfconfig since it's
only done when num_vfs is 0.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netdevsim')
| -rw-r--r-- | drivers/net/netdevsim/bus.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c index 29f5627d11e6..284223108d25 100644 --- a/drivers/net/netdevsim/bus.c +++ b/drivers/net/netdevsim/bus.c @@ -24,6 +24,14 @@ static struct nsim_bus_dev *to_nsim_bus_dev(struct device *dev) return container_of(dev, struct nsim_bus_dev, dev); } +static void +nsim_bus_dev_set_vfs(struct nsim_bus_dev *nsim_bus_dev, unsigned int num_vfs) +{ + rtnl_lock(); + nsim_bus_dev->num_vfs = num_vfs; + rtnl_unlock(); +} + static int nsim_bus_dev_vfs_enable(struct nsim_bus_dev *nsim_bus_dev, unsigned int num_vfs) { @@ -35,13 +43,13 @@ static int nsim_bus_dev_vfs_enable(struct nsim_bus_dev *nsim_bus_dev, if (!nsim_bus_dev->vfconfigs) return -ENOMEM; - nsim_bus_dev->num_vfs = num_vfs; + nsim_bus_dev_set_vfs(nsim_bus_dev, num_vfs); nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev); if (nsim_esw_mode_is_switchdev(nsim_dev)) { err = nsim_esw_switchdev_enable(nsim_dev, NULL); if (err) - nsim_bus_dev->num_vfs = 0; + nsim_bus_dev_set_vfs(nsim_bus_dev, 0); } return err; @@ -51,7 +59,7 @@ void nsim_bus_dev_vfs_disable(struct nsim_bus_dev *nsim_bus_dev) { struct nsim_dev *nsim_dev; - nsim_bus_dev->num_vfs = 0; + nsim_bus_dev_set_vfs(nsim_bus_dev, 0); nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev); if (nsim_esw_mode_is_switchdev(nsim_dev)) nsim_esw_legacy_enable(nsim_dev, NULL); |