From: Maurizio Lombardi <mlombard@redhat.com>
Date: Tue, 31 Jan 2023 16:38:42 +0000 (+0100)
Subject: nvme: clear the request_queue pointers on failure in nvme_alloc_io_tag_set
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=53fb698a8a280f33e43b5847d653b595b97e3947;p=users%2Fjedix%2Flinux-maple.git

nvme: clear the request_queue pointers on failure in nvme_alloc_io_tag_set

[ Upstream commit 6fbf13c0e24fd86ab2e4477cd8484a485b687421 ]

In nvme_alloc_io_tag_set(), the connect_q pointer should be set to NULL
in case of error to avoid potential invalid pointer dereferences.

Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index e189ce17deb3e..5acc9ae225df3 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4933,6 +4933,7 @@ int nvme_alloc_io_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set,
 
 out_free_tag_set:
 	blk_mq_free_tag_set(set);
+	ctrl->connect_q = NULL;
 	return ret;
 }
 EXPORT_SYMBOL_GPL(nvme_alloc_io_tag_set);