Commit 19816a02 authored Sep 05, 2022 by Sagi Grimberg Committed by Greg Kroah-Hartman Sep 15, 2022

nvme-tcp: fix UAF when detecting digest errors



[ Upstream commit 160f3549a907a50e51a8518678ba2dcf2541abea ]

We should also bail from the io_work loop when we set rd_enabled to true,
so we don't attempt to read data from the socket when the TCP stream is
already out-of-sync or corrupted.

Fixes: 3f2304f8 ("nvme-tcp: add NVMe over TCP host driver")
Reported-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent a4f0d345

drivers/nvme/host/tcp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1074,7 +1074,7 @@ static void nvme_tcp_io_work(struct work_struct *w)
		if (result > 0)
		pending = true;

		if (!pending)
		if (!pending \|\| !queue->rd_enabled)
		return;

		} while (!time_after(jiffies, deadline)); /* quota is exhausted */