Commit 64d23ff3 authored by Robin Murphy's avatar Robin Murphy Committed by Rafael J. Wysocki

ACPI: scan: Fix DMA range assignment

Assigning the device's dma_range_map from the iterator variable after
the loop means it always points to the empty terminator at the end of
the map, which is not what we want. Similarly, freeing the iterator on
error when it points to somwhere in the middle of the allocated array
won't work either. Fix this.

Fixes: bf2ee8d0 ("ACPI: scan: Support multiple DMA windows with different offsets")
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarJianmin Lv <lvjianmin@loongson.cn>
Tested-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Tested-by: default avatarYicong Yang <yangyicong@hisilicon.com>
Reviewed-by: default avatarLorenzo Pieralisi <lpieralisi@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9abf2313
...@@ -1509,9 +1509,12 @@ int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map) ...@@ -1509,9 +1509,12 @@ int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map)
goto out; goto out;
} }
*map = r;
list_for_each_entry(rentry, &list, node) { list_for_each_entry(rentry, &list, node) {
if (rentry->res->start >= rentry->res->end) { if (rentry->res->start >= rentry->res->end) {
kfree(r); kfree(*map);
*map = NULL;
ret = -EINVAL; ret = -EINVAL;
dev_dbg(dma_dev, "Invalid DMA regions configuration\n"); dev_dbg(dma_dev, "Invalid DMA regions configuration\n");
goto out; goto out;
...@@ -1523,8 +1526,6 @@ int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map) ...@@ -1523,8 +1526,6 @@ int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map)
r->offset = rentry->offset; r->offset = rentry->offset;
r++; r++;
} }
*map = r;
} }
out: out:
acpi_dev_free_resource_list(&list); acpi_dev_free_resource_list(&list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment