Commit 7e80eb79 authored by Keith Busch's avatar Keith Busch
Browse files

nvme: clear caller pointer on identify failure 



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

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 8d0d2447

drivers/nvme/host/core.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

}