From e6d31e57a4838859dc783b1320abe17042f17117 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Fri, 2 Jan 2026 15:53:18 +0100 Subject: [PATCH 1/2] fabrics: set crypto info to fabrics context When setting up the fabrics context it's also necessary to set the crypto info. Signed-off-by: Daniel Wagner --- fabrics.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fabrics.c b/fabrics.c index 4f78bf9d70..b2beaeb0b8 100644 --- a/fabrics.c +++ b/fabrics.c @@ -370,6 +370,11 @@ static int create_common_context(struct nvme_global_ctx *ctx, if (err) goto err; + err = nvmf_context_set_crypto(fctx, fa->hostkey, fa->ctrlkey, + fa->keyring, fa->tls_key, fa->tls_key_identity); + if (err) + goto err; + err = nvmf_context_set_persistent(fctx, persistent); if (err) goto err; From f9c7f8eb2b7bb36a554dfac8214a395086c0cad4 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Fri, 2 Jan 2026 15:54:22 +0100 Subject: [PATCH 2/2] linux: filter out key errors when looking up identity The lookup should only fail for non key related operations. If the identity is not available the identity will be created after this operations. Fixes: f4c6eee2939d ("rrc: return error codes directly") Signed-off-by: Daniel Wagner --- libnvme/src/nvme/linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnvme/src/nvme/linux.c b/libnvme/src/nvme/linux.c index 8149e21bf4..4f56e16b48 100644 --- a/libnvme/src/nvme/linux.c +++ b/libnvme/src/nvme/linux.c @@ -1813,7 +1813,7 @@ int __nvme_import_keys_from_config(nvme_host_t h, nvme_ctrl_t c, identity = nvme_ctrl_get_tls_key_identity(c); if (identity) { ret = nvme_lookup_key("psk", identity, &id); - if (ret) { + if (ret && !(ret == -ENOKEY || ret == -EKEYREVOKED)) { nvme_msg(h->ctx, LOG_ERR, "Failed to lookup key for identity %s, error %d\n", identity, ret);