Commit 193a8c7e authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme-auth: don't ignore key generation failures when initializing ctrl keys 



nvme_auth_generate_key can fail, don't ignore it upon initialization.

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f6b182fb

drivers/nvme/host/auth.c

+15 −4
Original line number Diff line number Diff line
@@ -972,15 +972,26 @@ static void nvme_ctrl_auth_work(struct work_struct *work) 
	 */

}



void nvme_auth_init_ctrl(struct nvme_ctrl *ctrl)

int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl)

{

	int ret;



	INIT_LIST_HEAD(&ctrl->dhchap_auth_list);

	INIT_WORK(&ctrl->dhchap_auth_work, nvme_ctrl_auth_work);

	mutex_init(&ctrl->dhchap_auth_mutex);

	if (!ctrl->opts)

		return;

	nvme_auth_generate_key(ctrl->opts->dhchap_secret, &ctrl->host_key);

	nvme_auth_generate_key(ctrl->opts->dhchap_ctrl_secret, &ctrl->ctrl_key);

		return 0;

	ret = nvme_auth_generate_key(ctrl->opts->dhchap_secret,

			&ctrl->host_key);

	if (ret)

		return ret;

	ret = nvme_auth_generate_key(ctrl->opts->dhchap_ctrl_secret,

			&ctrl->ctrl_key);

	if (ret) {

		nvme_auth_free_key(ctrl->host_key);

		ctrl->host_key = NULL;

	}

	return ret;

}

EXPORT_SYMBOL_GPL(nvme_auth_init_ctrl);

drivers/nvme/host/core.c

+5 −1
Original line number Diff line number Diff line
@@ -5119,9 +5119,13 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, 


	nvme_fault_inject_init(&ctrl->fault_inject, dev_name(ctrl->device));

	nvme_mpath_init_ctrl(ctrl);

	nvme_auth_init_ctrl(ctrl);

	ret = nvme_auth_init_ctrl(ctrl);

	if (ret)

		goto out_free_cdev;



	return 0;

out_free_cdev:

	cdev_device_del(&ctrl->cdev, ctrl->device);

out_free_name:

	nvme_put_ctrl(ctrl);

	kfree_const(ctrl->device->kobj.name);

drivers/nvme/host/nvme.h

+5 −2
Original line number Diff line number Diff line
@@ -1018,14 +1018,17 @@ static inline bool nvme_ctrl_sgl_supported(struct nvme_ctrl *ctrl) 
}



#ifdef CONFIG_NVME_AUTH

void nvme_auth_init_ctrl(struct nvme_ctrl *ctrl);

int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl);

void nvme_auth_stop(struct nvme_ctrl *ctrl);

int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid);

int nvme_auth_wait(struct nvme_ctrl *ctrl, int qid);

void nvme_auth_reset(struct nvme_ctrl *ctrl);

void nvme_auth_free(struct nvme_ctrl *ctrl);

#else

static inline void nvme_auth_init_ctrl(struct nvme_ctrl *ctrl) {};

static inline int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl)

{

	return 0;

}

static inline void nvme_auth_stop(struct nvme_ctrl *ctrl) {};

static inline int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid)

{