Commit 99c2dcc8 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Keith Busch
Browse files

nvme-core: fix memory leak in dhchap_ctrl_secret 



Free dhchap_secret in nvme_ctrl_dhchap_ctrl_secret_store() before we
return when nvme_auth_generate_key() returns error.

Fixes: f50fff73 ("nvme: implement In-Band authentication")
Signed-off-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent a836ca33

drivers/nvme/host/core.c

+5 −2
Original line number Diff line number Diff line
@@ -3882,8 +3882,10 @@ static ssize_t nvme_ctrl_dhchap_ctrl_secret_store(struct device *dev, 
		int ret;



		ret = nvme_auth_generate_key(dhchap_secret, &key);

		if (ret)

		if (ret) {

			kfree(dhchap_secret);

			return ret;

		}

		kfree(opts->dhchap_ctrl_secret);

		opts->dhchap_ctrl_secret = dhchap_secret;

		ctrl_key = ctrl->ctrl_key;
@@ -3891,7 +3893,8 @@ static ssize_t nvme_ctrl_dhchap_ctrl_secret_store(struct device *dev, 
		ctrl->ctrl_key = key;

		mutex_unlock(&ctrl->dhchap_auth_mutex);

		nvme_auth_free_key(ctrl_key);

	}

	} else

		kfree(dhchap_secret);

	/* Start re-authentication */

	dev_info(ctrl->device, "re-authenticating controller\n");

	queue_work(nvme_wq, &ctrl->dhchap_auth_work);