summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLiu Hua <sdu.liu@huawei.com>2014-03-27 06:56:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-07 10:28:17 -0700
commitb4c97e6c9c17a32267a78f5661c5a07dd5a53e02 (patch)
treeebb979a0b2473f8843f41e94244a345241cad52c /arch
parent542e7f333e12cb600e6a2a59356cae5ca8f0dea5 (diff)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/crash_dump.c2
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;