diff options
| author | Thomas Weißschuh <thomas.weissschuh@linutronix.de> | 2025-01-20 17:09:40 +0300 |
|---|---|---|
| committer | Rob Herring (Arm) <robh@kernel.org> | 2025-01-25 00:59:23 +0300 |
| commit | 15e2f65f2ecfeb8e39315522e2b5cfdc5651fc10 (patch) | |
| tree | 70d5b8371040882b019cf60ad63fb7fb739e5ae6 /drivers | |
| parent | 14bce187d1600710623d81888da3501bbc470ba2 (diff) | |
| download | linux-15e2f65f2ecfeb8e39315522e2b5cfdc5651fc10.tar.xz | |
of: address: Fix empty resource handling in __of_address_resource_bounds()
"resource->end" needs to always be equal to "resource->start + size - 1".
The previous version of the function did not perform the "- 1" in case
of an empty resource.
Also make sure to allow an empty resource at address 0.
Reported-by: Basharath Hussain Khaja <basharath@couthit.com>
Closes: https://lore.kernel.org/lkml/20250108140414.13530-1-basharath@couthit.com/
Fixes: 1a52a094c2f0 ("of: address: Unify resource bounds overflow checking")
Cc: stable@vger.kernel.org
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Link: https://lore.kernel.org/r/20250120-of-address-overflow-v1-1-dd68dbf47bce@linutronix.de
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/address.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 6c40f96a1961..26f7fc3d7599 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -185,17 +185,15 @@ static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns, static int __of_address_resource_bounds(struct resource *r, u64 start, u64 size) { - u64 end = start; - if (overflows_type(start, r->start)) return -EOVERFLOW; - if (size && check_add_overflow(end, size - 1, &end)) - return -EOVERFLOW; - if (overflows_type(end, r->end)) - return -EOVERFLOW; r->start = start; - r->end = end; + + if (!size) + r->end = wrapping_sub(typeof(r->end), r->start, 1); + else if (size && check_add_overflow(r->start, size - 1, &r->end)) + return -EOVERFLOW; return 0; } |