nvme-common: simplify nvme_auth_generate_key
Subsystems (2)
Christoph Hellwig
maintainerPATCH 1/1 nvme-common: simplify nvme_auth_generate_key
Return the key or NULL on success, and an ERR_PTR on failure instead of passing a separate ret_key argument to return the key.
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/nvme/common/auth.c | 20 +++++--------------- drivers/nvme/host/auth.c | 22 +++++++++++++--------- drivers/nvme/host/core.c | 14 ++++++-------- include/linux/nvme-auth.h | 2 +- 4 files changed, 25 insertions(+), 33 deletions(-)
drivers/nvme/common/auth.c +5 -15
@@ -455,28 +455,18 @@ int nvme_auth_gen_shared_secret(struct crypto_kpp *dh_tfm, }EXPORT_SYMBOL_GPL (nvme_auth_gen_shared_secret); -int nvme_auth_generate_key (u8 *secret,struct nvme_dhchap_key **ret_key) +struct nvme_dhchap_key *nvme_auth_generate_key (u8 *secret) { -struct nvme_dhchap_key *key;u8 key_hash; -if (!secret) { - *ret_key =NULL ; -return 0 ; - } +if (!secret) +return NULL ;if (sscanf (secret,"DHHC-1:%hhd:%*s:" , &key_hash) !=1 ) -return -EINVAL ; +return ERR_PTR (-EINVAL );/* Pass in the secret without the 'DHHC-1:XX:' prefix */ - key =nvme_auth_extract_key (secret +10 , key_hash); -if (IS_ERR (key)) { - *ret_key =NULL ; -return PTR_ERR (key); - } - - *ret_key = key; -return 0 ; +return nvme_auth_extract_key (secret +10 , key_hash); }EXPORT_SYMBOL_GPL (nvme_auth_generate_key);
drivers/nvme/host/auth.c +13 -9
@@ -943,16 +943,19 @@ int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl)INIT_WORK (&ctrl->dhchap_auth_work, nvme_ctrl_auth_work);if (!ctrl->opts)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) + + ctrl->host_key =nvme_auth_generate_key (ctrl->opts->dhchap_secret); +if (IS_ERR (ctrl->host_key)) { + ret =PTR_ERR (ctrl->host_key); + goto out; + } + ctrl->ctrl_key =nvme_auth_generate_key (ctrl->opts->dhchap_ctrl_secret); +if (IS_ERR (ctrl->ctrl_key)) { + ret =PTR_ERR (ctrl->ctrl_key); goto err_free_dhchap_secret; + } -if (!ctrl->opts->dhchap_secret && !ctrl->opts->dhchap_ctrl_secret) +if (!ctrl->host_key && !ctrl->ctrl_key)return 0 ; ctrl->dhchap_ctxs = kvcalloc(ctrl_max_dhchaps(ctrl),
@@ -972,9 +975,10 @@ int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl)return 0 ; err_free_dhchap_ctrl_secret:nvme_auth_free_key (ctrl->ctrl_key); - ctrl->ctrl_key =NULL ; err_free_dhchap_secret: + ctrl->ctrl_key =NULL ;nvme_auth_free_key (ctrl->host_key); +out: ctrl->host_key =NULL ;return ret; }
drivers/nvme/host/core.c +6 -8
@@ -3800,11 +3800,10 @@ static ssize_t nvme_ctrl_dhchap_secret_store(struct device *dev,nvme_auth_stop (ctrl);if (strcmp (dhchap_secret, opts->dhchap_secret)) {struct nvme_dhchap_key *key, *host_key; -int ret; - ret =nvme_auth_generate_key (dhchap_secret, &key); -if (ret) -return ret; + key =nvme_auth_generate_key (dhchap_secret); +if (IS_ERR (key)) +return PTR_ERR (key);kfree (opts->dhchap_secret); opts->dhchap_secret = dhchap_secret; host_key = ctrl->host_key;
@@ -3854,11 +3853,10 @@ static ssize_t nvme_ctrl_dhchap_ctrl_secret_store(struct device *dev,nvme_auth_stop (ctrl);if (strcmp (dhchap_secret, opts->dhchap_ctrl_secret)) {struct nvme_dhchap_key *key, *ctrl_key; -int ret; - ret =nvme_auth_generate_key (dhchap_secret, &key); -if (ret) -return ret; + key =nvme_auth_generate_key (dhchap_secret); +if (IS_ERR (key)) +return PTR_ERR (key);kfree (opts->dhchap_ctrl_secret); opts->dhchap_ctrl_secret = dhchap_secret; ctrl_key = ctrl->ctrl_key;
include/linux/nvme-auth.h +1 -1
@@ -28,7 +28,7 @@ struct nvme_dhchap_key *nvme_auth_extract_key(unsigned char *secret, u8 key_hash);void nvme_auth_free_key (struct nvme_dhchap_key *key);u8 *nvme_auth_transform_key (struct nvme_dhchap_key *key,char *nqn); -int nvme_auth_generate_key (u8 *secret,struct nvme_dhchap_key **ret_key); +struct nvme_dhchap_key *nvme_auth_generate_key (u8 *secret);int nvme_auth_augmented_challenge (u8 hmac_id,u8 *skey,size_t skey_len,u8 *challenge,u8 *aug,size_t hlen);int nvme_auth_gen_privkey (struct crypto_kpp *dh_tfm,u8 dh_gid);
Signature · 1 line
2.35.1
Quoted 2 lines · Christoph Hellwig
Return the key or NULL on success, and an
ERR_PTRon failure instead of passing a separateret_keyargument to return the key.
Reviewed-by Jens Axboe <[email protected]>
Signature · 1 line
Jens Axboe
Quoted 5 lines · Christoph Hellwig
Return the key or NULL on success, and an
ERR_PTRon failure instead of passing a separateret_keyargument to return the key.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good,
Reviewed-by Chaitanya Kulkarni <[email protected]>
-ck
Quoted 11 lines · Christoph Hellwig
Return the key or NULL on success, and an
ERR_PTRon failure instead of passing a separateret_keyargument to return the key.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/nvme/common/auth.c | 20 +++++--------------- drivers/nvme/host/auth.c | 22 +++++++++++++--------- drivers/nvme/host/core.c | 14 ++++++-------- include/linux/nvme-auth.h | 2 +- 4 files changed, 25 insertions(+), 33 deletions(-)
Reviewed-by Hannes Reinecke <[email protected]>
Cheers,
Hannes