Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 541e7579 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "block: nbd: add sanity check for first_minor" 

This reverts commit b3fa499d which is
commit b1a811633f7321cf1ae2bb76a66805b7720e44c9 upstream.

The backport of this is reported to be causing some problems, so revert
this for now until they are worked out.

Link: https://lore.kernel.org/r/CACPK8XfUWoOHr-0RwRoYoskia4fbAbZ7DYf5wWBnv6qUnGq18w@mail.gmail.com


Reported-by: default avatarJoel Stanley <joel@jms.id.au>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Pavel Skripkin <paskripkin@gmail.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f3ecbf4

drivers/block/nbd.c

+0 −10
Original line number Diff line number Diff line
@@ -1744,17 +1744,7 @@ static int nbd_dev_add(int index) 
	refcount_set(&nbd->refs, 1);

	INIT_LIST_HEAD(&nbd->list);

	disk->major = NBD_MAJOR;



	/* Too big first_minor can cause duplicate creation of

	 * sysfs files/links, since first_minor will be truncated to

	 * byte in __device_add_disk().

	 */

	disk->first_minor = index << part_shift;

	if (disk->first_minor > 0xff) {

		err = -EINVAL;

		goto out_free_idr;

	}



	disk->fops = &nbd_fops;

	disk->private_data = nbd;

	sprintf(disk->disk_name, "nbd%d", index);