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

[ 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>

diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
index 1a27d7f..9dfd3d0 100644 (file)
--- a/drivers/nvme/host/auth.c
+++ b/drivers/nvme/host/auth.c
@@ -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_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);
 

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 2b07a67..09ff0d7 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -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_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);

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 5ed771d..69f9e69 100644 (file)
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -1028,13 +1028,16 @@ 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_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)
 {