1 files changed, 16 insertions, 4 deletions

diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
index fce389c2342f..2e9852c0d487 100644
--- a/arch/um/kernel/skas/process.c
+++ b/arch/um/kernel/skas/process.c
@@ -6,19 +6,25 @@
 #include "linux/init.h"
 #include "linux/sched.h"
 #include "as-layout.h"
+#include "kern.h"
 #include "os.h"
 #include "skas.h"
 
 int new_mm(unsigned long stack)
 {
-        int fd;
+        int fd, err;
 
         fd = os_open_file("/proc/mm", of_cloexec(of_write(OPENFLAGS())), 0);
         if (fd < 0)
                 return fd;
 
-        if (skas_needs_stub)
-                map_stub_pages(fd, STUB_CODE, STUB_DATA, stack);
+        if (skas_needs_stub) {
+                err = map_stub_pages(fd, STUB_CODE, STUB_DATA, stack);
+                if (err) {
+                        os_close_file(fd);
+                        return err;
+                }
+        }
 
         return fd;
 }
@@ -49,8 +55,14 @@ int __init start_uml(void)
 {
         stack_protections((unsigned long) &cpu0_irqstack);
         set_sigstack(cpu0_irqstack, THREAD_SIZE);
-        if (proc_mm)
+        if (proc_mm) {
                 userspace_pid[0] = start_userspace(0);
+                if (userspace_pid[0] < 0) {
+                        printf("start_uml - start_userspace returned %d\n",
+                               userspace_pid[0]);
+                        exit(1);
+                }
+        }
 
         init_new_thread_signals();