From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Sun, 21 Sep 2008 14:27:13 +0000 (+0900)
Subject: x86: check for ioremap() failure in copy_oldmem_page()
X-Git-Tag: v2.6.28-rc1~734^2^5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=af2d237bf574f89ae5a1b67f2556a324c8f64ff5;p=linux-2.6-omap-h63xx.git

x86: check for ioremap() failure in copy_oldmem_page()

Add a check for ioremap() failure in copy_oldmem_page().
This patch also includes small coding style fixes.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
index 15e6c6bc4a4..280d6ef3af0 100644
--- a/arch/x86/kernel/crash_dump_64.c
+++ b/arch/x86/kernel/crash_dump_64.c
@@ -33,14 +33,16 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
 		return 0;
 
 	vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE);
+	if (!vaddr)
+		return -ENOMEM;
 
 	if (userbuf) {
-		if (copy_to_user(buf, (vaddr + offset), csize)) {
+		if (copy_to_user(buf, vaddr + offset, csize)) {
 			iounmap(vaddr);
 			return -EFAULT;
 		}
 	} else
-	memcpy(buf, (vaddr + offset), csize);
+		memcpy(buf, vaddr + offset, csize);
 
 	iounmap(vaddr);
 	return csize;