mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] x86: check for ioremap() failure in copy_oldmem_page()
@ 2008-09-21 14:27 Akinobu Mita
  2008-09-22 10:15 ` Ingo Molnar
  0 siblings, 1 reply; 3+ messages in thread
From: Akinobu Mita @ 2008-09-21 14:27 UTC (permalink / raw)
  To: linux-kernel; +Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin

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>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
---
 arch/x86/kernel/crash_dump_64.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: 2.6-git/arch/x86/kernel/crash_dump_64.c
===================================================================
--- 2.6-git.orig/arch/x86/kernel/crash_dump_64.c
+++ 2.6-git/arch/x86/kernel/crash_dump_64.c
@@ -33,14 +33,16 @@ ssize_t copy_oldmem_page(unsigned long p
 		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;

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] x86: check for ioremap() failure in copy_oldmem_page()
  2008-09-21 14:27 [PATCH] x86: check for ioremap() failure in copy_oldmem_page() Akinobu Mita
@ 2008-09-22 10:15 ` Ingo Molnar
  2008-09-22 12:38   ` Akinobu Mita
  0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2008-09-22 10:15 UTC (permalink / raw)
  To: Akinobu Mita
  Cc: linux-kernel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
	Eric W. Biederman


* Akinobu Mita <akinobu.mita@gmail.com> wrote:

> 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>

applied to tip/x86/crashdump, thanks!

I'm curious, have you found this bug via the fault-injection framework, 
or via code review?

	Ingo

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] x86: check for ioremap() failure in copy_oldmem_page()
  2008-09-22 10:15 ` Ingo Molnar
@ 2008-09-22 12:38   ` Akinobu Mita
  0 siblings, 0 replies; 3+ messages in thread
From: Akinobu Mita @ 2008-09-22 12:38 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: linux-kernel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
	Eric W. Biederman

2008/9/22 Ingo Molnar <mingo@elte.hu>:
>
> * Akinobu Mita <akinobu.mita@gmail.com> wrote:
>
>> 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>
>
> applied to tip/x86/crashdump, thanks!
>
> I'm curious, have you found this bug via the fault-injection framework,
> or via code review?

I found it via code review.
But I forgot why I was looking at crash_dump_64.c...

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-09-22 12:38 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-09-21 14:27 [PATCH] x86: check for ioremap() failure in copy_oldmem_page() Akinobu Mita
2008-09-22 10:15 ` Ingo Molnar
2008-09-22 12:38   ` Akinobu Mita

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®