diff options
| author |  Keith Busch <kbusch@kernel.org>
| 2020-11-13 10:45:45 -0800 |
|---|---|---|
| committer |  Christoph Hellwig <hch@lst.de>
| 2020-11-14 09:57:55 +0100 |
| commit | 8168d23fbcee4f9f6c5a1ce8650417f09aef70eb (patch) | |
| tree | 9921efe963e679f99953ba22b6f63e3c9bd60522 /drivers/nvme | |
| parent | nvme: directly cache command effects log (diff) | |
| download | linux-8168d23fbcee4f9f6c5a1ce8650417f09aef70eb.tar.gz linux-8168d23fbcee4f9f6c5a1ce8650417f09aef70eb.tar.bz2 linux-8168d23fbcee4f9f6c5a1ce8650417f09aef70eb.zip | |
nvme: fix memory leak freeing command effects
xa_destroy() frees only internal data. The caller is responsible for
freeing the exteranl objects referenced by an xarray.
Fixes: 1cf7a12e09aa4 ("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>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 2f96675cc0cf..9a270e49df17 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -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); |