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

Commit 7e5dd57e authored by Minwoo Im's avatar Minwoo Im Committed by Christoph Hellwig
Browse files

nvme-pci: fix NULL pointer dereference in nvme_free_host_mem() 



Following condition which will cause NULL pointer dereference will
occur in nvme_free_host_mem() when it tries to remove pci device via
nvme_remove() especially after a failure of host memory allocation for HMB.

    "(host_mem_descs == NULL) && (nr_host_mem_descs != 0)"

It's because __nr_host_mem_descs__ is not cleared to 0 unlike
__host_mem_descs__ is so.

Signed-off-by: default avatarMinwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent eb1bd249

drivers/nvme/host/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1759,6 +1759,7 @@ static void nvme_free_host_mem(struct nvme_dev *dev) 
			dev->nr_host_mem_descs * sizeof(*dev->host_mem_descs),

			dev->host_mem_descs, dev->host_mem_descs_dma);

	dev->host_mem_descs = NULL;

	dev->nr_host_mem_descs = 0;

}



static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,