--- arch/x86/mm/fault.c

+++ arch/x86/mm/fault.c

@@ -801,8 +801,10 @@ do_sigbus(struct pt_regs *regs, unsigned

up_read(&mm->mmap_sem);

/* Kernel mode? Handle exceptions or die: */

- if (!(error_code & PF_USER))

+ if (!(error_code & PF_USER)) {

no_context(regs, error_code, address);

+ return;

+ }

/* User-space => ok to do another page fault: */

if (is_prefetch(regs, error_code, address))

@@ -828,6 +830,13 @@ mm_fault_error(struct pt_regs *regs, uns

unsigned long address, unsigned int fault)

{

if (fault & VM_FAULT_OOM) {

+ /* Kernel mode? Handle exceptions or die: */

+ if (!(error_code & PF_USER)) {

+ up_read(&current->mm->mmap_sem);

+ no_context(regs, error_code, address);

+ return;

+ }

+

out_of_memory(regs, error_code, address);

} else {

if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON))