]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
nvme-pci: DMA unmap the correct regions in nvme_free_sgls
authorRoger Pau Monne <roger.pau@citrix.com>
Tue, 27 Jan 2026 19:59:06 +0000 (20:59 +0100)
committerKeith Busch <kbusch@kernel.org>
Wed, 28 Jan 2026 14:58:10 +0000 (06:58 -0800)
The call to nvme_free_sgls() in nvme_unmap_data() has the sg_list and sge
parameters swapped.  This wasn't noticed by the compiler because both share
the same type.  On a Xen PV hardware domain, and possibly any other
architectures that takes that path, this leads to corruption of the NVMe
contents.

Fixes: f0887e2a52d4 ("nvme-pci: create common sgl unmapping helper")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
drivers/nvme/host/pci.c

index 58f3097888a76e7a2460d614ccdebb10bc7cac0e..c2bee32332fee39b239828342edb552e4c5a798b 100644 (file)
@@ -806,8 +806,8 @@ static void nvme_unmap_data(struct request *req)
        if (!blk_rq_dma_unmap(req, dma_dev, &iod->dma_state, iod->total_len,
                              map)) {
                if (nvme_pci_cmd_use_sgl(&iod->cmd))
-                       nvme_free_sgls(req, iod->descriptors[0],
-                                      &iod->cmd.common.dptr.sgl, attrs);
+                       nvme_free_sgls(req, &iod->cmd.common.dptr.sgl,
+                                      iod->descriptors[0], attrs);
                else
                        nvme_free_prps(req, attrs);
        }