nbd: fix possible overflow for 'first_minor' in nbd_dev_add()

commit 940c264984fd1457918393c49674f6b39ee16506 upstream.

If 'part_shift' is not zero, then 'index << part_shift' might
overflow to a value that is not greater than '0xfffff', then sysfs
might complains about duplicate creation.

Fixes: b0d9111a2d53 ("nbd: use an idr to keep track of nbd devices")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Link: https://lore.kernel.org/r/20211102015237.2309763-3-yebin10@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Wen Yang <wenyang.linux@foxmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index bd05eaf04143ce39fcf0f1c9d6acd6153a5b5ddc..1ddae8f768d57d7149926ac9ae1a1f184549e5a6 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1773,11 +1773,11 @@ static int nbd_dev_add(int index)
        disk->major = NBD_MAJOR;
 
        /* Too big first_minor can cause duplicate creation of
-        * sysfs files/links, since MKDEV() expect that the max bits of
-        * first_minor is 20.
+        * sysfs files/links, since index << part_shift might overflow, or
+        * MKDEV() expect that the max bits of first_minor is 20.
         */
        disk->first_minor = index << part_shift;
-       if (disk->first_minor > MINORMASK) {
+       if (disk->first_minor < index || disk->first_minor > MINORMASK) {
                err = -EINVAL;
                goto out_free_idr;
        }