Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 100193f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux 

Pull devicetree bugfix from Grant Likely:
 "Important bug fix for parsing 64-bit addresses on 32-bit platforms.
  Without this patch the kernel will try to use memory ranges that
  cannot be reached"

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
  of: Check for phys_addr_t overflows in early_init_dt_add_memory_arch
parents 8addf0c7 a67a6ed1

drivers/of/fdt.c

+15 −0
Original line number Diff line number Diff line
@@ -880,6 +880,21 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) 
	const u64 phys_offset = __pa(PAGE_OFFSET);

	base &= PAGE_MASK;

	size &= PAGE_MASK;



	if (sizeof(phys_addr_t) < sizeof(u64)) {

		if (base > ULONG_MAX) {

			pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",

					base, base + size);

			return;

		}



		if (base + size > ULONG_MAX) {

			pr_warning("Ignoring memory range 0x%lx - 0x%llx\n",

					ULONG_MAX, base + size);

			size = ULONG_MAX - base;

		}

	}



	if (base + size < phys_offset) {

		pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",

			   base, base + size);