netdevsim: take rtnl_lock when assigning num_vfs
authorJakub Kicinski <kuba@kernel.org>
Sat, 30 Oct 2021 23:15:01 +0000 (16:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Nov 2021 13:29:41 +0000 (13:29 +0000)
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>
drivers/net/netdevsim/bus.c

index 29f5627..2842231 100644 (file)
@@ -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);