[PATCH 07/11] nvme-tcp: check for invalidated or revoked key

hare
2024-01-23T14:19:49Z

key_lookup() will always return a key, even if that key is revoked
or invalidated. So check for invalid keys before continuing.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/nvme/host/fabrics.c | 7 ++++++-
drivers/nvme/host/tcp.c | 8 +++++++-
2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index aa88606a44c4..a7da088331dc 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -635,7 +635,12 @@ static struct key *nvmf_parse_key(int key_id)
key = key_lookup(key_id);
if (!IS_ERR(key))
pr_err("key id %08x not found\n", key_id);
- else
+ else if (test_bit(KEY_FLAG_REVOKED, &key->flags) ||
+ test_bit(KEY_FLAG_INVALIDATED, &key->flags)) {
+ pr_err("key id %08x invalid\n", key_id);
+ key_put(key);
+ key = ERR_PTR(-EKEYREVOKED);
+ } else
pr_debug("Using key id %08x\n", key_id);
return key;
}
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index c160b1a64ec0..fe4fcfa073a3 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -1571,9 +1571,15 @@ static void nvme_tcp_tls_done(void *data, int status, key_serial_t pskid)

tls_key = key_lookup(pskid);
if (IS_ERR(tls_key)) {
- dev_warn(ctrl->ctrl.device, "queue %d: Invalid key %x\n",
+ dev_warn(ctrl->ctrl.device, "queue %d: key %x not found\n",
qid, pskid);
queue->tls_err = -ENOKEY;
+ } else if (test_bit(KEY_FLAG_REVOKED, &tls_key->flags) ||
+ test_bit(KEY_FLAG_INVALIDATED, &tls_key->flags)) {
+ dev_warn(ctrl->ctrl.device, "queue %d: key %08x invalid\n",
+ qid, pskid);
+ key_put(tls_key);
+ queue->tls_err = -EKEYREVOKED;
} else {
ctrl->ctrl.tls_key = tls_key;
queue->tls_err = 0;
--
2.35.3