diff options
| author | Damien Le Moal <dlemoal@kernel.org> | 2024-05-27 07:34:45 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-05-27 22:56:58 +0300 |
| commit | d9ff882b54f99f96787fa3df7cd938966843c418 (patch) | |
| tree | ac8c83ffe23845a47d278e721b534cc63b13debf /drivers | |
| parent | c8c1f7012b807ca4da0136eacab96961b56f25d5 (diff) | |
| download | linux-d9ff882b54f99f96787fa3df7cd938966843c418.tar.xz | |
null_blk: Fix return value of nullb_device_power_store()
When powering on a null_blk device that is not already on, the return
value ret that is initialized to be count is reused to check the return
value of null_add_dev(), leading to nullb_device_power_store() to return
null_add_dev() return value (0 on success) instead of "count".
So make sure to set ret to be equal to count when there are no errors.
Fixes: a2db328b0839 ("null_blk: fix null-ptr-dereference while configuring 'power' and 'submit_queues'")
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Kanchan Joshi <joshi.k@samsung.com>
Link: https://lore.kernel.org/r/20240527043445.235267-1-dlemoal@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/null_blk/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index eb023d267369..631dca2e4e84 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -494,6 +494,7 @@ static ssize_t nullb_device_power_store(struct config_item *item, set_bit(NULLB_DEV_FL_CONFIGURED, &dev->flags); dev->power = newp; + ret = count; } else if (dev->power && !newp) { if (test_and_clear_bit(NULLB_DEV_FL_UP, &dev->flags)) { dev->power = newp; |