diff options
| author | Liu Hua <sdu.liu@huawei.com> | 2014-03-27 06:56:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-07 12:10:00 +0100 |
| commit | 8fad87bca7ac9737e413ba5f1656f1114a8c314d (patch) | |
| tree | 5962461250dbb421d380b0486697486bbe4b57cf /arch/arm/kernel/crash_dump.c | |
| parent | c7d442f46c1bb18e48204f41c3d838c475eb5130 (diff) | |
| download | talos-op-linux-8fad87bca7ac9737e413ba5f1656f1114a8c314d.tar.gz talos-op-linux-8fad87bca7ac9737e413ba5f1656f1114a8c314d.zip | |
ARM: 8012/1: kdump: Avoid overflow when converting pfn to physaddr
When we configure CONFIG_ARM_LPAE=y, pfn << PAGE_SHIFT will
overflow if pfn >= 0x100000 in copy_oldmem_page.
So use __pfn_to_phys for converting.
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/crash_dump.c')
| -rw-r--r-- | arch/arm/kernel/crash_dump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/crash_dump.c b/arch/arm/kernel/crash_dump.c index 90c50d4b43f7..5d1286d51154 100644 --- a/arch/arm/kernel/crash_dump.c +++ b/arch/arm/kernel/crash_dump.c @@ -39,7 +39,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, if (!csize) return 0; - vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE); + vaddr = ioremap(__pfn_to_phys(pfn), PAGE_SIZE); if (!vaddr) return -ENOMEM; |
