| From 8fad87bca7ac9737e413ba5f1656f1114a8c314d Mon Sep 17 00:00:00 2001 |
| From: Liu Hua <sdu.liu@huawei.com> |
| Date: Thu, 27 Mar 2014 06:56:18 +0100 |
| Subject: ARM: 8012/1: kdump: Avoid overflow when converting pfn to physaddr |
| |
| From: Liu Hua <sdu.liu@huawei.com> |
| |
| 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> |
| |
| --- |
| arch/arm/kernel/crash_dump.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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 p |
| if (!csize) |
| return 0; |
| |
| - vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE); |
| + vaddr = ioremap(__pfn_to_phys(pfn), PAGE_SIZE); |
| if (!vaddr) |
| return -ENOMEM; |
| |
