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

Commit f7c4ce89 authored by André Almeida's avatar André Almeida Committed by Jens Axboe
Browse files

null_blk: validate the number of devices 



A negative number of devices is nonsensical, so change the type to
unsigned. If the number of devices is 0, it is impossible for userspace
to interact with the module, so refuse loading the driver for that case.

Signed-off-by: default avatarAndré Almeida <andrealmeid@collabora.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4e47ee8f

drivers/block/null_blk_main.c

+5 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int g_bs = 512; 
module_param_named(bs, g_bs, int, 0444);

MODULE_PARM_DESC(bs, "Block size (in bytes)");



static int nr_devices = 1;

static unsigned int nr_devices = 1;

module_param(nr_devices, int, 0444);

MODULE_PARM_DESC(nr_devices, "Number of devices to register");
@@ -1767,6 +1767,10 @@ static int __init null_init(void) 
		pr_err("null_blk: legacy IO path no longer available\n");

		return -EINVAL;

	}

	if (!nr_devices) {

		pr_err("null_blk: invalid number of devices\n");

		return -EINVAL;

	}

	if (g_queue_mode == NULL_Q_MQ && g_use_per_node_hctx) {

		if (g_submit_queues != nr_online_nodes) {

			pr_warn("null_blk: submit_queues param is set to %u.\n",