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

Commit 92d499d4 authored by Dan Carpenter's avatar Dan Carpenter Committed by Jens Axboe
Browse files

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: ca33dd92 ("skd: Convert to blk-mq")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c0b3dda7

drivers/block/skd_main.c

+7 −8
Original line number Diff line number Diff line
@@ -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) {

	rc = blk_mq_alloc_tag_set(&skdev->tag_set);

	if (rc)

		goto err_out;

	q = blk_mq_init_queue(&skdev->tag_set);

		if (!q)

	if (IS_ERR(q)) {

		blk_mq_free_tag_set(&skdev->tag_set);

	}

	if (!q) {

		rc = -ENOMEM;

		rc = PTR_ERR(q);

		goto err_out;

	}

	blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);