diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-10-29 17:09:32 +0100 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-12-16 15:09:16 +0800 |
| commit | d1b52bd5c9920f1b0106366a0d4ce08227ebd179 (patch) | |
| tree | 6fd60042a429f15fd394b9f815c21b38b1d14485 /drivers | |
| parent | 3001558e960879f9cbf6f572100efbc0ce7820db (diff) | |
of: check for size < 0 after rounding in early_init_dt_add_memory_arch
Memory regions passed to early_init_dt_add_memory_arch() are rounded to
PAGE_SIZE by subtracting the size of the leading fractional page from
the 'size' argument. However, size being a u64 type, if its value is
sufficiently small, the subtraction wraps around and produces a bogus
value, potentially leading to crashes.
Fix this by ignoring the memory range in such cases.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit 8cccffc52694938fc88f3d90bc7fed8460e27191)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/fdt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index fdbb5072ab1d..92e545b6de1d 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -928,6 +928,11 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) const u64 phys_offset = __pa(PAGE_OFFSET); if (!PAGE_ALIGNED(base)) { + if (size < PAGE_SIZE - (base & ~PAGE_MASK)) { + pr_warn("Ignoring memory block 0x%llx - 0x%llx\n", + base, base + size); + return; + } size -= PAGE_SIZE - (base & ~PAGE_MASK); base = PAGE_ALIGN(base); } |