summaryrefslogtreecommitdiff
path: root/drivers/nvme
diff options
context:
space:
mode:
authorVitaliy Shevtsov <v.shevtsov@maxima.ru>2024-09-16 22:41:37 +0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-11-08 16:26:46 +0100
commitc94e965f766321641ec38e4eece9ce8884543244 (patch)
treeb4933bc827236aa0444bc1a60c0a833e99d67e77 /drivers/nvme
parent618d1939243f535bad32dffd7488d44e28e159ef (diff)
downloadlinux-c94e965f766321641ec38e4eece9ce8884543244.tar.gz
linux-c94e965f766321641ec38e4eece9ce8884543244.tar.bz2
linux-c94e965f766321641ec38e4eece9ce8884543244.zip
nvmet-auth: assign dh_key to NULL after kfree_sensitive
[ Upstream commit d2f551b1f72b4c508ab9298419f6feadc3b5d791 ] ctrl->dh_key might be used across multiple calls to nvmet_setup_dhgroup() for the same controller. So it's better to nullify it after release on error path in order to avoid double free later in nvmet_destroy_auth(). Found by Linux Verification Center (linuxtesting.org) with Svace. Fixes: 7a277c37d352 ("nvmet-auth: Diffie-Hellman key exchange support") Cc: stable@vger.kernel.org Signed-off-by: Vitaliy Shevtsov <v.shevtsov@maxima.ru> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Keith Busch <kbusch@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/nvme')
-rw-r--r--drivers/nvme/target/auth.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/target/auth.c b/drivers/nvme/target/auth.c
index aacc05ec00c2..74791078fdeb 100644
--- a/drivers/nvme/target/auth.c
+++ b/drivers/nvme/target/auth.c
@@ -101,6 +101,7 @@ int nvmet_setup_dhgroup(struct nvmet_ctrl *ctrl, u8 dhgroup_id)
pr_debug("%s: ctrl %d failed to generate private key, err %d\n",
__func__, ctrl->cntlid, ret);
kfree_sensitive(ctrl->dh_key);
+ ctrl->dh_key = NULL;
return ret;
}
ctrl->dh_keysize = crypto_kpp_maxsize(ctrl->dh_tfm);