mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

skd: error pointer dereference in skd_cons_disk()

Browse source 
My initial impulse was to check for IS_ERR_OR_NULL() but when I looked
at this code a bit more closely, we should only need to check for
IS_ERR().

The blk_mq_alloc_tag_set() returns negative error codes and zero on
success so we can just do an "if (rc) goto err_out;".  It's better to
preserve the error code anyhow.  The blk_mq_init_queue() returns error
pointers on failure, it never returns NULL.  We can also remove the
"q = NULL;" at the start because that's no longer needed.

Fixes: ca33dd9296 ("skd: Convert to blk-mq")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Dan Carpenter 2017-08-23 14:20:57 +03:00 committed by Jens Axboe
parent c0b3dda7ed
commit 92d499d490
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/block/skd_main.c
View file

@ -2862,7 +2862,6 @@ static int skd_cons_disk(struct skd_device *skdev)
disk->fops = &skd_blockdev_ops; disk->fops = &skd_blockdev_ops;
disk->private_data = skdev; disk->private_data = skdev;
q = NULL;
memset(&skdev->tag_set, 0, sizeof(skdev->tag_set)); memset(&skdev->tag_set, 0, sizeof(skdev->tag_set));
skdev->tag_set.ops = &skd_mq_ops; skdev->tag_set.ops = &skd_mq_ops;
skdev->tag_set.nr_hw_queues = 1; skdev->tag_set.nr_hw_queues = 1;
@ -2874,13 +2873,13 @@ static int skd_cons_disk(struct skd_device *skdev)
BLK_MQ_F_SG_MERGE | BLK_MQ_F_SG_MERGE |
BLK_ALLOC_POLICY_TO_MQ_FLAG(BLK_TAG_ALLOC_FIFO); BLK_ALLOC_POLICY_TO_MQ_FLAG(BLK_TAG_ALLOC_FIFO);
skdev->tag_set.driver_data = skdev; skdev->tag_set.driver_data = skdev;
if (blk_mq_alloc_tag_set(&skdev->tag_set) >= 0) { rc = blk_mq_alloc_tag_set(&skdev->tag_set);
q = blk_mq_init_queue(&skdev->tag_set); if (rc)
if (!q) goto err_out;
blk_mq_free_tag_set(&skdev->tag_set); q = blk_mq_init_queue(&skdev->tag_set);
} if (IS_ERR(q)) {
if (!q) { blk_mq_free_tag_set(&skdev->tag_set);
rc = -ENOMEM; rc = PTR_ERR(q);
goto err_out; goto err_out;
} }
blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH); blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);