]> git.itanic.dy.fi Git - linux-stable/commitdiff
nvme-tcp: fix UAF when detecting digest errors
authorSagi Grimberg <sagi@grimberg.me>
Mon, 5 Sep 2022 10:54:17 +0000 (13:54 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Sep 2022 09:30:06 +0000 (11:30 +0200)
[ 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: 3f2304f8c6d6 ("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>
drivers/nvme/host/tcp.c

index 20138e132558c9e93d337833a8b4822ad0a9f494..2c6e0311357162600515b44ebec0ab12f326b140 100644 (file)
@@ -1209,7 +1209,7 @@ static void nvme_tcp_io_work(struct work_struct *w)
                else if (unlikely(result < 0))
                        return;
 
-               if (!pending)
+               if (!pending || !queue->rd_enabled)
                        return;
 
        } while (!time_after(jiffies, deadline)); /* quota is exhausted */