Commit 5fc42295 authored by Alistair Francis's avatar Alistair Francis Committed by Keith Busch
Browse files

nvmet-tcp: Don't clear tls_key when freeing sq 



Curently after the host sends a REPLACETLSPSK we free the TLS keys as
part of calling nvmet_auth_sq_free() on success. This means when the
host sends a follow up REPLACETLSPSK we return CONCAT_MISMATCH as the
check for !nvmet_queue_tls_keyid(req->sq) fails.

A previous attempt to fix this involed not calling nvmet_auth_sq_free()
on successful connections, but that results in memory leaks. Instead we
should not clear `tls_key` in nvmet_auth_sq_free(), as that was
incorrectly wiping the tls keys which are used for the session.

This patch ensures we correctly free the ephemeral session key on
connection, yet we don't free the TLS key unless closing the connection.

Reviewed-by: default avatarChris Leech <cleech@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent f920ebd0

drivers/nvme/target/auth.c

+0 −3
Original line number Diff line number Diff line
@@ -229,9 +229,6 @@ u8 nvmet_setup_auth(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq, bool reset) 
void nvmet_auth_sq_free(struct nvmet_sq *sq)

{

	cancel_delayed_work(&sq->auth_expired_work);

#ifdef CONFIG_NVME_TARGET_TCP_TLS

	sq->tls_key = NULL;

#endif

	kfree(sq->dhchap_c1);

	sq->dhchap_c1 = NULL;

	kfree(sq->dhchap_c2);