diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-01 13:41:55 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-01 13:41:55 -1000 |
| commit | f4a1e8e36973e2034c9eac2b3538470f8b2748a4 (patch) | |
| tree | 632018fae450e75e92e3bb4814154c01a7e6106d /drivers/nvme/target/auth.c | |
| parent | f0d3699aef2b6f864c78ccfa8e2a7327f65b8841 (diff) | |
| parent | d0c6cc6c6a6164a853e86206309b5a5bc5e3e72b (diff) | |
Merge tag 'block-6.12-20241101' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
- Fixup for a recent blk_rq_map_user_bvec() patch
- NVMe pull request via Keith:
- Spec compliant identification fix (Keith)
- Module parameter to enable backward compatibility on unusual
namespace formats (Keith)
- Target double free fix when using keys (Vitaliy)
- Passthrough command error handling fix (Keith)
* tag 'block-6.12-20241101' of git://git.kernel.dk/linux:
nvme: re-fix error-handling for io_uring nvme-passthrough
nvmet-auth: assign dh_key to NULL after kfree_sensitive
nvme: module parameter to disable pi with offsets
block: fix queue limits checks in blk_rq_map_user_bvec for real
nvme: enhance cns version checking
Diffstat (limited to 'drivers/nvme/target/auth.c')
| -rw-r--r-- | drivers/nvme/target/auth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/target/auth.c b/drivers/nvme/target/auth.c index 29f8639cfe7f..b47d675232d2 100644 --- a/drivers/nvme/target/auth.c +++ b/drivers/nvme/target/auth.c @@ -115,6 +115,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); |