[PATCH] nvme: clear caller pointer on identify failure

[PATCH] nvme: clear caller pointer on identify failure

[Keith Busch]

From: Keith Busch <kbusch@kernel.org>

The memory allocated for the identifification is freed on failure. Set
it to NULL so the caller doesn't have a pointer to that freed address.

Signed-off-by: Keith Busch <kbusch@kernel.org>
---
 drivers/nvme/host/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c4d928585ce35..2baf5786a92fe 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1403,8 +1403,10 @@ static int nvme_identify_ctrl(struct nvme_ctrl *dev, struct nvme_id_ctrl **id)
 
 	error = nvme_submit_sync_cmd(dev->admin_q, &c, *id,
 			sizeof(struct nvme_id_ctrl));
-	if (error)
+	if (error) {
 		kfree(*id);
+		*id = NULL;
+	}
 	return error;
 }
 
@@ -1533,6 +1535,7 @@ int nvme_identify_ns(struct nvme_ctrl *ctrl, unsigned nsid,
 	if (error) {
 		dev_warn(ctrl->device, "Identify namespace failed (%d)\n", error);
 		kfree(*id);
+		*id = NULL;
 	}
 	return error;
 }
-- 
2.34.1

Re: [PATCH] nvme: clear caller pointer on identify failure

[Christoph Hellwig]

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH] nvme: clear caller pointer on identify failure

[Chaitanya Kulkarni]

On 3/6/2024 6:25 AM, Keith Busch wrote:
> From: Keith Busch <kbusch@kernel.org>
> 
> The memory allocated for the identifification is freed on failure. Set
> it to NULL so the caller doesn't have a pointer to that freed address.
> 
> Signed-off-by: Keith Busch <kbusch@kernel.org>
> ---

LGTM.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

-ck