diff options
| author |   Jason Wang <jasowang@redhat.com> | 2022-06-20 13:11:14 +0800 |
|---|---|---|
| committer |   Michael S. Tsirkin <mst@redhat.com> | 2022-06-27 08:04:30 -0400 |
| commit | 11a37eb66812ce6a06b79223ad530eb0e1d7294d (patch) | |
| tree | 64dc6b1073a7603577a3a261eb521a835b33dac6 /drivers/net/caif | |
| parent | virtio-net: fix race between ndo_open() and virtio_device_ready() (diff) | |
| download | linux-dev-11a37eb66812ce6a06b79223ad530eb0e1d7294d.tar.xz linux-dev-11a37eb66812ce6a06b79223ad530eb0e1d7294d.zip | |
caif_virtio: fix race between virtio_device_ready() and ndo_open()
We currently depend on probe() calling virtio_device_ready() -
which happens after netdev
registration. Since ndo_open() can be called immediately
after register_netdev, this means there exists a race between
ndo_open() and virtio_device_ready(): the driver may start to use the
device (e.g. TX) before DRIVER_OK which violates the spec.
Fix this by switching to use register_netdevice() and protect the
virtio_device_ready() with rtnl_lock() to make sure ndo_open() can
only be called after virtio_device_ready().
Fixes: 0d2e1a2926b18 ("caif_virtio: Introduce caif over virtio")
Signed-off-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20220620051115.3142-3-jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/net/caif')
| -rw-r--r-- | drivers/net/caif/caif_virtio.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c index 5458f57177a0..0b0f234b0b50 100644 --- a/drivers/net/caif/caif_virtio.c +++ b/drivers/net/caif/caif_virtio.c @@ -722,13 +722,21 @@ static int cfv_probe(struct virtio_device *vdev) /* Carrier is off until netdevice is opened */ netif_carrier_off(netdev); + /* serialize netdev register + virtio_device_ready() with ndo_open() */ + rtnl_lock(); + /* register Netdev */ - err = register_netdev(netdev); + err = register_netdevice(netdev); if (err) { + rtnl_unlock(); dev_err(&vdev->dev, "Unable to register netdev (%d)\n", err); goto err; } + virtio_device_ready(vdev); + + rtnl_unlock(); + debugfs_init(cfv); return 0; |