Commit 85f74acf authored Oct 06, 2021 by Keith Busch

nvme-pci: Fix abort command id



The request tag is no longer the only component of the command id.

Fixes: e7006de6 ("nvme: code command_id with a genctr for use-after-free validation")
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Keith Busch <kbusch@kernel.org>

parent 298ba0e3

drivers/nvme/host/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1330,7 +1330,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
		iod->aborted = 1;

		cmd.abort.opcode = nvme_admin_abort_cmd;
		cmd.abort.cid = req->tag;
		cmd.abort.cid = nvme_cid(req);
		cmd.abort.sqid = cpu_to_le16(nvmeq->qid);

		dev_warn(nvmeq->dev->ctrl.device,