| Message ID | 20210214183904.5432-1-vincent.stehle@laposte.net |
|---|---|
| State | Accepted |
| Commit | 25d34b936cef12cf8b481b64fe9d02c08df12908 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | virtio: fix off by one device id comparison | expand |
On Sun, Feb 14, 2021 at 07:39:04PM +0100, Vincent Stehlé wrote: > VIRTIO_ID_MAX_NUM is the largest device ID plus 1. Therefore a device id > cannot be greater or equal to VIRTIO_ID_MAX_NUM. Fix the comparison > accordingly. > > Fixes: 8fb49b4c7a82 ("dm: Add a new uclass driver for VirtIO transport devices") > Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net> > Cc: Simon Glass <sjg@chromium.org> > Cc: Bin Meng <bmeng.cn@gmail.com> Applied to u-boot/master, thanks!
diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c index cf2cfaef2cf..0379536c542 100644 --- a/drivers/virtio/virtio-uclass.c +++ b/drivers/virtio/virtio-uclass.c @@ -227,7 +227,7 @@ static int virtio_uclass_post_probe(struct udevice *udev) struct udevice *vdev; int ret; - if (uc_priv->device > VIRTIO_ID_MAX_NUM) { + if (uc_priv->device >= VIRTIO_ID_MAX_NUM) { debug("(%s): virtio device ID %d exceeds maximum num\n", udev->name, uc_priv->device); return 0;
VIRTIO_ID_MAX_NUM is the largest device ID plus 1. Therefore a device id cannot be greater or equal to VIRTIO_ID_MAX_NUM. Fix the comparison accordingly. Fixes: 8fb49b4c7a82 ("dm: Add a new uclass driver for VirtIO transport devices") Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> --- drivers/virtio/virtio-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)