diff options
| author | Liu Hua <sdu.liu@huawei.com> | 2014-03-27 06:56:18 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-07-11 13:33:59 +0100 |
| commit | 64bf838ef253a6c5b05530461f2aee94bbfecc5b (patch) | |
| tree | ee883bc6118848ef66722050284d5daf66386ac2 | |
| parent | fac90e80d8e567113477de8f1ce91e2e3410ac57 (diff) | |
| download | kernel_samsung_smdk4412-64bf838ef253a6c5b05530461f2aee94bbfecc5b.zip kernel_samsung_smdk4412-64bf838ef253a6c5b05530461f2aee94bbfecc5b.tar.gz kernel_samsung_smdk4412-64bf838ef253a6c5b05530461f2aee94bbfecc5b.tar.bz2 | |
ARM: 8012/1: kdump: Avoid overflow when converting pfn to physaddr
commit 8fad87bca7ac9737e413ba5f1656f1114a8c314d upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -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 90c50d4..5d1286d 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; |