Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5228b328 authored by Jan H. Schönherr's avatar Jan H. Schönherr Committed by Sagi Grimberg
Browse files

nvme: fix uninitialized prp2 value on small transfers 



The value of iod->first_dma ends up as prp2 in NVMe commands. In case
there is not enough data to cross a page boundary, iod->first_dma is
never initialized and contains random data.

Comply with the NVMe specification and fill in 0 in that case.

Signed-off-by: default avatarJan H. Schönherr <jschoenh@amazon.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent a7b7c7a1

drivers/nvme/host/pci.c

+3 −1
Original line number Diff line number Diff line
@@ -555,8 +555,10 @@ static blk_status_t nvme_setup_prps(struct nvme_dev *dev, struct request *req) 
	int nprps, i;



	length -= (page_size - offset);

	if (length <= 0)

	if (length <= 0) {

		iod->first_dma = 0;

		return BLK_STS_OK;

	}



	dma_len -= (page_size - offset);

	if (dma_len) {