nvme-pci: avoid hmb desc array idx out-of-bound when hmmaxd set.
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 nvme-pci: avoid hmb desc array idx out-of-bound when hmmaxd set.
+ added linux-nvme at lists.infradead.org
Quoted 36 lines · Minwoo Im
hmb descriptor idx out-of-bound occurs in case of below conditions. preferred = 128MiB
chunk_size= 4MiB
hmmaxd = 1Current code will not allow rmmod which will free hmb descriptors to be done successfully in above case.
"descs[i]" will be set in for-loop without seeing any conditions related to "
max_entries" after a single "descs" was allocated by (max_entries= 1) in this case.Added a condition into for-loop to check index of descriptors.
Fixes 044a9df1("nvme-pci: implement the HMB entry number and size limitations")Signed-off-by Minwoo Im <minwoo.im.dev at gmail.com>--- drivers/nvme/host/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/nvme/host/pci.c +1
-2@@ -1787,7 +1787,7 @@ static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,if (!bufs) goto out_free_descs; -for (size =0 ; size < preferred; size += len) { +for (size =0 ; size < preferred && i < max_entries; size += len) {dma_addr_t dma_addr; len =min_t (u64, chunk_size, preferred - size); --2.7.4
PATCH 1/1 nvme-pci: avoid hmb desc array idx out-of-bound when hmmaxd set.
Looks good.
Christoph Hellwig
AppliedPATCH 1/1 nvme-pci: avoid hmb desc array idx out-of-bound when hmmaxd set.
In reply to Minwoo ImThanks,
applied to nvme-4.15.