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

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 <>
Signed-off-by: default avatarChristoph Hellwig <>
parent a7b7c7a1
......@@ -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) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment