Skip to content

Commit 260364d

Browse files
rpptakpm00
authored andcommitted
arm[64]/memremap: don't abuse pfn_valid() to ensure presence of linear map
The semantics of pfn_valid() is to check presence of the memory map for a PFN and not whether a PFN is covered by the linear map. The memory map may be present for NOMAP memory regions, but they won't be mapped in the linear mapping. Accessing such regions via __va() when they are memremap()'ed will cause a crash. On v5.4.y the crash happens on qemu-arm with UEFI [1]: <1>[ 0.084476] 8<--- cut here --- <1>[ 0.084595] Unable to handle kernel paging request at virtual address dfb76000 <1>[ 0.084938] pgd = (ptrval) <1>[ 0.085038] [dfb76000] *pgd=5f7fe801, *pte=00000000, *ppte=00000000 ... <4>[ 0.093923] [<c0ed6ce8>] (memcpy) from [<c16a06f8>] (dmi_setup+0x60/0x418) <4>[ 0.094204] [<c16a06f8>] (dmi_setup) from [<c16a38d4>] (arm_dmi_init+0x8/0x10) <4>[ 0.094408] [<c16a38d4>] (arm_dmi_init) from [<c0302e9c>] (do_one_initcall+0x50/0x228) <4>[ 0.094619] [<c0302e9c>] (do_one_initcall) from [<c16011e4>] (kernel_init_freeable+0x15c/0x1f8) <4>[ 0.094841] [<c16011e4>] (kernel_init_freeable) from [<c0f028cc>] (kernel_init+0x8/0x10c) <4>[ 0.095057] [<c0f028cc>] (kernel_init) from [<c03010e8>] (ret_from_fork+0x14/0x2c) On kernels v5.10.y and newer the same crash won't reproduce on ARM because commit b10d6bc ("arch, drivers: replace for_each_membock() with for_each_mem_range()") changed the way memory regions are registered in the resource tree, but that merely covers up the problem. On ARM64 memory resources registered in yet another way and there the issue of wrong usage of pfn_valid() to ensure availability of the linear map is also covered. Implement arch_memremap_can_ram_remap() on ARM and ARM64 to prevent access to NOMAP regions via the linear mapping in memremap(). Link: https://lore.kernel.org/all/[email protected] Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Mike Rapoport <[email protected]> Reported-by: "kernelci.org bot" <[email protected]> Tested-by: Mark Brown <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]> Acked-by: Catalin Marinas <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Mark Brown <[email protected]> Cc: Mark-PK Tsai <[email protected]> Cc: Russell King <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Will Deacon <[email protected]> Cc: <[email protected]> [5.4+] Signed-off-by: Andrew Morton <[email protected]>
1 parent 1927e49 commit 260364d

File tree

4 files changed

+23
-0
lines changed

4 files changed

+23
-0
lines changed

arch/arm/include/asm/io.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,9 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);
440440
#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
441441
extern int valid_phys_addr_range(phys_addr_t addr, size_t size);
442442
extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
443+
extern bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size,
444+
unsigned long flags);
445+
#define arch_memremap_can_ram_remap arch_memremap_can_ram_remap
443446
#endif
444447

445448
/*

arch/arm/mm/ioremap.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,3 +493,11 @@ void __init early_ioremap_init(void)
493493
{
494494
early_ioremap_setup();
495495
}
496+
497+
bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size,
498+
unsigned long flags)
499+
{
500+
unsigned long pfn = PHYS_PFN(offset);
501+
502+
return memblock_is_map_memory(pfn);
503+
}

arch/arm64/include/asm/io.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,4 +192,8 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);
192192
extern int valid_phys_addr_range(phys_addr_t addr, size_t size);
193193
extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
194194

195+
extern bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size,
196+
unsigned long flags);
197+
#define arch_memremap_can_ram_remap arch_memremap_can_ram_remap
198+
195199
#endif /* __ASM_IO_H */

arch/arm64/mm/ioremap.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,11 @@ void __init early_ioremap_init(void)
9999
{
100100
early_ioremap_setup();
101101
}
102+
103+
bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size,
104+
unsigned long flags)
105+
{
106+
unsigned long pfn = PHYS_PFN(offset);
107+
108+
return pfn_is_map_memory(pfn);
109+
}

0 commit comments

Comments
 (0)