diff options
| author | Leon Romanovsky <leonro@nvidia.com> | 2024-07-24 12:31:14 +0200 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2024-07-25 16:20:54 +0200 |
| commit | c31fad1470389666ac7169fe43aa65bf5b7e2cfd (patch) | |
| tree | c2980209a5830fbfc9d5025d5d5c409cf3ac7fbf | |
| parent | nvme-core: choose PIF from QPIF if QPIFS supports and PIF is QTYPE (diff) | |
| download | linux-c31fad1470389666ac7169fe43aa65bf5b7e2cfd.tar.xz linux-c31fad1470389666ac7169fe43aa65bf5b7e2cfd.zip | |
nvme-pci: add missing condition check for existence of mapped data
nvme_map_data() is called when request has physical segments, hence
the nvme_unmap_data() should have same condition to avoid dereference.
Fixes: 4aedb705437f ("nvme-pci: split metadata handling from nvme_map_data / nvme_unmap_data")
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Nitesh Shetty <nj.shetty@samsung.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
| -rw-r--r-- | drivers/nvme/host/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 8087b054da66..6cd9395ba9ec 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -863,7 +863,8 @@ static blk_status_t nvme_prep_rq(struct nvme_dev *dev, struct request *req) nvme_start_request(req); return BLK_STS_OK; out_unmap_data: - nvme_unmap_data(dev, req); + if (blk_rq_nr_phys_segments(req)) + nvme_unmap_data(dev, req); out_free_cmd: nvme_cleanup_cmd(req); return ret; |