From: Hannes Reinecke <hare@suse.de>
Date: Wed, 21 Feb 2024 14:07:28 +0000 (+0100)
Subject: linux: allow for NULL argument in nvme_lookup_keyring()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5c75d3c7d1b1bda0a8a92c8c6083a563ccc0a9e9;p=users%2Fsagi%2Flibnvme.git

linux: allow for NULL argument in nvme_lookup_keyring()

Use the default '.nvme' keyring when nvme_lookup_keyring() is called
with a NULL argument.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/src/nvme/linux.c b/src/nvme/linux.c
index e29d9e72..1127fc84 100644
--- a/src/nvme/linux.c
+++ b/src/nvme/linux.c
@@ -31,6 +31,8 @@
 
 #ifdef CONFIG_KEYUTILS
 #include <keyutils.h>
+
+#define NVME_TLS_DEFAULT_KEYRING ".nvme"
 #endif
 
 #include <ccan/endian/endian.h>
@@ -1158,6 +1160,8 @@ long nvme_lookup_keyring(const char *keyring)
 {
 	key_serial_t keyring_id;
 
+	if (!keyring)
+		keyring = NVME_TLS_DEFAULT_KEYRING;
 	keyring_id = find_key_by_type_and_desc("keyring", keyring, 0);
 	if (keyring_id < 0)
 		return 0;