From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Lei Rao <lei.rao@intel.com>, Christoph Hellwig <hch@lst.de>,
Sasha Levin <sashal@kernel.org>,
kbusch@kernel.org, axboe@fb.com, sagi@grimberg.me,
linux-nvme@lists.infradead.org
Subject: [PATCH AUTOSEL 5.10 10/10] nvme-pci: clear the prp2 field when not used
Date: Tue, 6 Dec 2022 04:50:27 -0500 [thread overview]
Message-ID: <20221206095027.987587-10-sashal@kernel.org> (raw)
In-Reply-To: <20221206095027.987587-1-sashal@kernel.org>
From: Lei Rao <lei.rao@intel.com>
[ Upstream commit a56ea6147facce4ac1fc38675455f9733d96232b ]
If the prp2 field is not filled in nvme_setup_prp_simple(), the prp2
field is garbage data. According to nvme spec, the prp2 is reserved if
the data transfer does not cross a memory page boundary, so clear it to
zero if it is not used.
Signed-off-by: Lei Rao <lei.rao@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/nvme/host/pci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 089f39103584..c222d7bf6ce1 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -817,6 +817,8 @@ static blk_status_t nvme_setup_prp_simple(struct nvme_dev *dev,
cmnd->dptr.prp1 = cpu_to_le64(iod->first_dma);
if (bv->bv_len > first_prp_len)
cmnd->dptr.prp2 = cpu_to_le64(iod->first_dma + first_prp_len);
+ else
+ cmnd->dptr.prp2 = 0;
return BLK_STS_OK;
}
--
2.35.1
prev parent reply other threads:[~2022-12-06 9:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-06 9:50 [PATCH AUTOSEL 5.10 01/10] ASoC: fsl_micfil: explicitly clear software reset bit Sasha Levin
2022-12-06 9:50 ` [PATCH AUTOSEL 5.10 02/10] ASoC: fsl_micfil: explicitly clear CHnF flags Sasha Levin
2022-12-06 9:50 ` [PATCH AUTOSEL 5.10 03/10] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() Sasha Levin
2022-12-06 9:50 ` [PATCH AUTOSEL 5.10 04/10] libbpf: Use page size as max_entries when probing ring buffer map Sasha Levin
2022-12-06 9:50 ` [PATCH AUTOSEL 5.10 05/10] pinctrl: meditatek: Startup with the IRQs disabled Sasha Levin
2022-12-06 9:50 ` [PATCH AUTOSEL 5.10 06/10] can: sja1000: fix size of OCR_MODE_MASK define Sasha Levin
2022-12-06 9:50 ` [PATCH AUTOSEL 5.10 07/10] can: mcba_usb: Fix termination command argument Sasha Levin
2022-12-06 9:50 ` [PATCH AUTOSEL 5.10 08/10] net: loopback: use NET_NAME_PREDICTABLE for name_assign_type Sasha Levin
2022-12-06 9:50 ` [PATCH AUTOSEL 5.10 09/10] ASoC: cs42l51: Correct PGA Volume minimum value Sasha Levin
2022-12-06 9:50 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221206095027.987587-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=axboe@fb.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=lei.rao@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox