korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

nvme-tcp: check for invalidated or revoked key

Browse Source 
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@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
This commit is contained in:
Hannes Reinecke 2024-07-22 14:02:20 +02:00 committed by Keith Busch
parent 363895767f
commit 5bc46b49c8
5 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/nvme/common/keyring.c
View File

@ -20,6 +20,28 @@ key_serial_t nvme_keyring_id(void)
} }
EXPORT_SYMBOL_GPL(nvme_keyring_id); EXPORT_SYMBOL_GPL(nvme_keyring_id);
static bool nvme_tls_psk_revoked(struct key *psk)
{
return test_bit(KEY_FLAG_REVOKED, &psk->flags) ||
test_bit(KEY_FLAG_INVALIDATED, &psk->flags);
}
struct key *nvme_tls_key_lookup(key_serial_t key_id)
{
struct key *key = key_lookup(key_id);
if (IS_ERR(key)) {
pr_err("key id %08x not found\n", key_id);
return key;
}
if (nvme_tls_psk_revoked(key)) {
pr_err("key id %08x revoked\n", key_id);
return ERR_PTR(-EKEYREVOKED);
}
return key;
}
EXPORT_SYMBOL_GPL(nvme_tls_key_lookup);
static void nvme_tls_psk_describe(const struct key *key, struct seq_file *m) static void nvme_tls_psk_describe(const struct key *key, struct seq_file *m)
{ {
seq_puts(m, key->description); seq_puts(m, key->description);

1
drivers/nvme/host/Kconfig
View File

@ -109,6 +109,7 @@ config NVME_HOST_AUTH
bool "NVMe over Fabrics In-Band Authentication in host side" bool "NVMe over Fabrics In-Band Authentication in host side"
depends on NVME_CORE depends on NVME_CORE
select NVME_AUTH select NVME_AUTH
select NVME_KEYRING if NVME_TCP_TLS
help help
This provides support for NVMe over Fabrics In-Band Authentication in This provides support for NVMe over Fabrics In-Band Authentication in
host side. host side.

2
drivers/nvme/host/fabrics.c
View File

@ -665,7 +665,7 @@ static struct key *nvmf_parse_key(int key_id)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
key = key_lookup(key_id); key = nvme_tls_key_lookup(key_id);
if (IS_ERR(key)) if (IS_ERR(key))
pr_err("key id %08x not found\n", key_id); pr_err("key id %08x not found\n", key_id);
else else

2
drivers/nvme/host/tcp.c
View File

@ -1596,7 +1596,7 @@ static void nvme_tcp_tls_done(void *data, int status, key_serial_t pskid)
goto out_complete; goto out_complete;
} }
tls_key = key_lookup(pskid); tls_key = nvme_tls_key_lookup(pskid);
if (IS_ERR(tls_key)) { if (IS_ERR(tls_key)) {
dev_warn(ctrl->ctrl.device, "queue %d: Invalid key %x\n", dev_warn(ctrl->ctrl.device, "queue %d: Invalid key %x\n",
qid, pskid); qid, pskid);

6
include/linux/nvme-keyring.h
View File

@ -12,7 +12,7 @@ key_serial_t nvme_tls_psk_default(struct key *keyring,
const char *hostnqn, const char *subnqn); const char *hostnqn, const char *subnqn);
key_serial_t nvme_keyring_id(void); key_serial_t nvme_keyring_id(void);
struct key *nvme_tls_key_lookup(key_serial_t key_id);
#else #else
static inline key_serial_t nvme_tls_psk_default(struct key *keyring, static inline key_serial_t nvme_tls_psk_default(struct key *keyring,
@ -24,5 +24,9 @@ static inline key_serial_t nvme_keyring_id(void)
{ {
return 0; return 0;
} }
static inline struct key *nvme_tls_key_lookup(key_serial_t key_id)
{
return ERR_PTR(-ENOTSUPP);
}
#endif /* !CONFIG_NVME_KEYRING */ #endif /* !CONFIG_NVME_KEYRING */
#endif /* _NVME_KEYRING_H */ #endif /* _NVME_KEYRING_H */