summaryrefslogtreecommitdiff
path: root/drivers/block/skd_main.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-08-23 14:20:57 +0300
committerJens Axboe <axboe@kernel.dk>2017-08-23 08:36:45 -0600
commit92d499d4905ce79c41a4b9a399ab6b89188f87e9 (patch)
treec08997e6fec4b9f5bd205c3ba7d00ee24e8f47ef /drivers/block/skd_main.c
parentc0b3dda7ed4d7f08b6a39ff8b35895780a68e384 (diff)
skd: error pointer dereference in skd_cons_disk()
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: ca33dd92968b ("skd: Convert to blk-mq") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/skd_main.c')
-rw-r--r--drivers/block/skd_main.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index 35938ee0651a..a467c18cc047 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -2862,7 +2862,6 @@ static int skd_cons_disk(struct skd_device *skdev)
disk->fops = &skd_blockdev_ops;
disk->private_data = skdev;
- q = NULL;
memset(&skdev->tag_set, 0, sizeof(skdev->tag_set));
skdev->tag_set.ops = &skd_mq_ops;
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_ALLOC_POLICY_TO_MQ_FLAG(BLK_TAG_ALLOC_FIFO);
skdev->tag_set.driver_data = skdev;
- if (blk_mq_alloc_tag_set(&skdev->tag_set) >= 0) {
- q = blk_mq_init_queue(&skdev->tag_set);
- if (!q)
- blk_mq_free_tag_set(&skdev->tag_set);
- }
- if (!q) {
- rc = -ENOMEM;
+ rc = blk_mq_alloc_tag_set(&skdev->tag_set);
+ if (rc)
+ goto err_out;
+ q = blk_mq_init_queue(&skdev->tag_set);
+ if (IS_ERR(q)) {
+ blk_mq_free_tag_set(&skdev->tag_set);
+ rc = PTR_ERR(q);
goto err_out;
}
blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);