From 8e93e2bdfbb2ebf00a0b4f6d1693d7f5f8a66d4e Mon Sep 17 00:00:00 2001
From: Jan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de>
Date: Tue, 26 Jul 2016 18:30:48 +0200
Subject: 3.10.75 -> 3.10.76

---
 arch/um/kernel/trap.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'arch/um')

diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 5c3aef742..06ab0ebe0 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -80,6 +80,8 @@ good_area:
 		if (unlikely(fault & VM_FAULT_ERROR)) {
 			if (fault & VM_FAULT_OOM) {
 				goto out_of_memory;
+			} else if (fault & VM_FAULT_SIGSEGV) {
+				goto out;
 			} else if (fault & VM_FAULT_SIGBUS) {
 				err = -EACCES;
 				goto out;
-- 
cgit v1.2.3