Skip to content

Commit df4666a

Browse files
martin-gpykeithbusch
authored andcommitted
nvme-tcp: send only permitted commands for secure concat
In addition to sending permitted commands such as connect/auth over the initial unencrypted admin connection as part of secure channel concatenation, the host also sends commands such as Property Get and Identify on the same. This is a spec violation leading to secure concat failures. Fix this by ensuring these additional commands are avoided on this connection. Fixes: 104d0e2 ("nvme-fabrics: reset admin connection for secure concatenation") Signed-off-by: Martin George <marting@netapp.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Keith Busch <kbusch@kernel.org>
1 parent 891cdbb commit df4666a

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/nvme/host/tcp.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2250,6 +2250,9 @@ static int nvme_tcp_configure_admin_queue(struct nvme_ctrl *ctrl, bool new)
22502250
if (error)
22512251
goto out_cleanup_tagset;
22522252

2253+
if (ctrl->opts->concat && !ctrl->tls_pskid)
2254+
return 0;
2255+
22532256
error = nvme_enable_ctrl(ctrl);
22542257
if (error)
22552258
goto out_stop_queue;

0 commit comments

Comments
 (0)