summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2020-12-07 14:54:46 +0000
committerJens Axboe <axboe@kernel.dk>2020-12-07 08:00:32 -0700
commit733c15bd3a944b8eeaacdddf061759b6a83dd3f4 (patch)
treeeb2e3e2f2ab8a6c2eefcebd373d2dba1b172336f /drivers/block
parent64e8a6ece1a5b1fa21316918053d068baeac84af (diff)
block/rnbd: fix a null pointer dereference on dev->blk_symlink_name
Currently in the case where dev->blk_symlink_name fails to be allocates the error return path attempts to set an end-of-string character to the unallocated dev->blk_symlink_name causing a null pointer dereference error. Fix this by returning with an explicity ENOMEM error (which also is missing in the original code as was not initialized). Fixes: 1eb54f8f5dd8 ("block/rnbd: client: sysfs interface functions") Signed-off-by: Colin Ian King <colin.king@canonical.com> Addresses-Coverity: ("Dereference after null check") Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rnbd/rnbd-clt-sysfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rnbd/rnbd-clt-sysfs.c b/drivers/block/rnbd/rnbd-clt-sysfs.c
index c3c96a567568..a7caeedeb198 100644
--- a/drivers/block/rnbd/rnbd-clt-sysfs.c
+++ b/drivers/block/rnbd/rnbd-clt-sysfs.c
@@ -499,7 +499,7 @@ static int rnbd_clt_add_dev_symlink(struct rnbd_clt_dev *dev)
dev->blk_symlink_name = kzalloc(len, GFP_KERNEL);
if (!dev->blk_symlink_name) {
rnbd_clt_err(dev, "Failed to allocate memory for blk_symlink_name\n");
- goto out_err;
+ return -ENOMEM;
}
ret = rnbd_clt_get_path_name(dev, dev->blk_symlink_name,