nvme: fix memory leak freeing command effects (8168d23f) · Commits · 戴 / test

xa_destroy() frees only internal data. The caller is responsible for freeing the exteranl objects referenced by an xarray. Fixes: ("nvme: use an xarray to lookup the Commands Supported and Effects log") Signed-off-by:

Keith Busch <kbusch@kernel.org> Signed-off-by:

Christoph Hellwig <hch@lst.de>

drivers/nvme/host/core.c

+14 −2

Original line number	Diff line number	Diff line
		@@ -4373,6 +4373,19 @@ void nvme_uninit_ctrl(struct nvme_ctrl *ctrl)
		}
		EXPORT_SYMBOL_GPL(nvme_uninit_ctrl);

		static void nvme_free_cels(struct nvme_ctrl *ctrl)
		{
		struct nvme_effects_log *cel;
		unsigned long i;

		xa_for_each (&ctrl->cels, i, cel) {
		xa_erase(&ctrl->cels, i);
		kfree(cel);
		}

		xa_destroy(&ctrl->cels);
		}

		static void nvme_free_ctrl(struct device *dev)
		{
		struct nvme_ctrl *ctrl =
		@@ -4382,8 +4395,7 @@ static void nvme_free_ctrl(struct device *dev)
		if (!subsys \|\| ctrl->instance != subsys->instance)
		ida_simple_remove(&nvme_instance_ida, ctrl->instance);

		xa_destroy(&ctrl->cels);

		nvme_free_cels(ctrl);
		nvme_mpath_uninit(ctrl);
		__free_page(ctrl->discard_page);

Admin message