Linux block layer
 help / color / mirror / Atom feed
From: SurajSonawane2415 <surajsonawane0215@gmail.com>
To: axboe@kernel.dk
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
	SurajSonawane2415 <surajsonawane0215@gmail.com>
Subject: [PATCH] block: Fix elevator_get_default() to check for null q->tag_set
Date: Fri,  4 Oct 2024 18:09:22 +0530	[thread overview]
Message-ID: <20241004123922.35834-1-surajsonawane0215@gmail.com> (raw)

Fix null pointer error by checking if q->tag_set is null.
Address "block/elevator.c:569 elevator_get_default() error:
we previously assumed 'q->tag_set' could be null (see line 565)"
This change prevents errors by making sure q->tag_set is valid
before accessing its flags.

Signed-off-by: SurajSonawane2415 <surajsonawane0215@gmail.com>
---
 block/elevator.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/block/elevator.c b/block/elevator.c
index 4122026b1..9ca32a6bd 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -562,12 +562,14 @@ static inline bool elv_support_iosched(struct request_queue *q)
  */
 static struct elevator_type *elevator_get_default(struct request_queue *q)
 {
-	if (q->tag_set && q->tag_set->flags & BLK_MQ_F_NO_SCHED_BY_DEFAULT)
-		return NULL;
+	if (q->tag_set) {
+		if (q->tag_set->flags & BLK_MQ_F_NO_SCHED_BY_DEFAULT)
+			return NULL;
 
-	if (q->nr_hw_queues != 1 &&
-	    !blk_mq_is_shared_tags(q->tag_set->flags))
-		return NULL;
+		if (q->nr_hw_queues != 1 &&
+			!blk_mq_is_shared_tags(q->tag_set->flags))
+			return NULL;
+	}
 
 	return elevator_find_get(q, "mq-deadline");
 }
-- 
2.34.1


             reply	other threads:[~2024-10-04 12:39 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-04 12:39 SurajSonawane2415 [this message]
2024-10-07  5:53 ` [PATCH] block: Fix elevator_get_default() to check for null q->tag_set Christoph Hellwig
2024-10-07 11:14 ` [PATCH V2] " SurajSonawane2415
2024-10-07 20:24   ` Jens Axboe
2024-10-07 20:26   ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241004123922.35834-1-surajsonawane0215@gmail.com \
    --to=surajsonawane0215@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox