Skip to content

Commit f862685

Browse files
avaginIngo Molnar
authored andcommitted
x86/mm: Handle mm_fault_error() in kernel space
mm_fault_error() should not execute oom-killer, if page fault occurs in kernel space. E.g. in copy_from_user()/copy_to_user(). This would happen if we find ourselves in OOM on a copy_to_user(), or a copy_from_user() which faults. Without this patch, the kernels hangs up in copy_from_user(), because OOM killer sends SIG_KILL to current process, but it can't handle a signal while in syscall, then the kernel returns to copy_from_user(), reexcute current command and provokes page_fault again. With this patch the kernel return -EFAULT from copy_from_user(). The code, which checks that page fault occurred in kernel space, has been copied from do_sigbus(). This situation is handled by the same way on powerpc, xtensa, tile, ... Signed-off-by: Andrey Vagin <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
1 parent a7bd1da commit f862685

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

arch/x86/mm/fault.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,13 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code,
828828
unsigned long address, unsigned int fault)
829829
{
830830
if (fault & VM_FAULT_OOM) {
831+
/* Kernel mode? Handle exceptions or die: */
832+
if (!(error_code & PF_USER)) {
833+
up_read(&current->mm->mmap_sem);
834+
no_context(regs, error_code, address);
835+
return;
836+
}
837+
831838
out_of_memory(regs, error_code, address);
832839
} else {
833840
if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON|

0 commit comments

Comments
 (0)