NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
[ Upstream commit 193a8c7e5f1a8481841636cec9c185543ec5c759 ]

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

Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Stable-dep-of: 7ed5cf8e6d9b ("nvme-core: fix dev_pm_qos memleak")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sagi Grimberg 2022-11-13 13:24:10 +02:00 • committed by Greg Kroah-Hartman
parent 43d0724d75
commit a584cf03ff
3 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
drivers/nvme/host/auth.c
View file

@ -956,15 +956,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_LIST_HEAD(&ctrl->dhchap_auth_list);
INIT_WORK(&ctrl->dhchap_auth_work, nvme_ctrl_auth_work); INIT_WORK(&ctrl->dhchap_auth_work, nvme_ctrl_auth_work);
mutex_init(&ctrl->dhchap_auth_mutex); mutex_init(&ctrl->dhchap_auth_mutex);
if (!ctrl->opts) if (!ctrl->opts)
return; return 0;
nvme_auth_generate_key(ctrl->opts->dhchap_secret, &ctrl->host_key); ret = nvme_auth_generate_key(ctrl->opts->dhchap_secret,
nvme_auth_generate_key(ctrl->opts->dhchap_ctrl_secret, &ctrl->ctrl_key); &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); EXPORT_SYMBOL_GPL(nvme_auth_init_ctrl);

6
drivers/nvme/host/core.c
View file

@ -5171,9 +5171,13 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev,
nvme_fault_inject_init(&ctrl->fault_inject, dev_name(ctrl->device)); nvme_fault_inject_init(&ctrl->fault_inject, dev_name(ctrl->device));
nvme_mpath_init_ctrl(ctrl); nvme_mpath_init_ctrl(ctrl);
nvme_auth_init_ctrl(ctrl); ret = nvme_auth_init_ctrl(ctrl);
if (ret)
goto out_free_cdev;
return 0; return 0;
out_free_cdev:
cdev_device_del(&ctrl->cdev, ctrl->device);
out_free_name: out_free_name:
nvme_put_ctrl(ctrl); nvme_put_ctrl(ctrl);
kfree_const(ctrl->device->kobj.name); kfree_const(ctrl->device->kobj.name);

7
drivers/nvme/host/nvme.h
View file

@ -1028,13 +1028,16 @@ static inline bool nvme_ctrl_sgl_supported(struct nvme_ctrl *ctrl)
} }
#ifdef CONFIG_NVME_AUTH #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); void nvme_auth_stop(struct nvme_ctrl *ctrl);
int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid); int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid);
int nvme_auth_wait(struct nvme_ctrl *ctrl, int qid); int nvme_auth_wait(struct nvme_ctrl *ctrl, int qid);
void nvme_auth_free(struct nvme_ctrl *ctrl); void nvme_auth_free(struct nvme_ctrl *ctrl);
#else #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 void nvme_auth_stop(struct nvme_ctrl *ctrl) {};
static inline int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid) static inline int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid)
{ {