5 files changed, 47 insertions, 14 deletions

diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index 26e0164895e4..2db18cbbb0ea 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -264,6 +264,15 @@ int os_read_file(int fd, void *buf, int len)
         return n;
 }
 
+int os_pread_file(int fd, void *buf, int len, unsigned long long offset)
+{
+        int n = pread(fd, buf, len, offset);
+
+        if (n < 0)
+                return -errno;
+        return n;
+}
+
 int os_write_file(int fd, const void *buf, int len)
 {
         int n = write(fd, (void *) buf, len);
@@ -282,6 +291,16 @@ int os_sync_file(int fd)
         return n;
 }
 
+int os_pwrite_file(int fd, const void *buf, int len, unsigned long long offset)
+{
+        int n = pwrite(fd, (void *) buf, len, offset);
+
+        if (n < 0)
+                return -errno;
+        return n;
+}
+
+
 int os_file_size(const char *file, unsigned long long *size_out)
 {
         struct uml_stat buf;
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index 897e9ad0c108..8b1767668515 100644
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -106,6 +106,17 @@ static int __init make_tempfile(const char *template)
                 }
         }
 
+#ifdef O_TMPFILE
+        fd = open(tempdir, O_CLOEXEC | O_RDWR | O_EXCL | O_TMPFILE, 0700);
+        /*
+         * If the running system does not support O_TMPFILE flag then retry
+         * without it.
+         */
+        if (fd != -1 || (errno != EINVAL && errno != EISDIR &&
+                        errno != EOPNOTSUPP))
+                return fd;
+#endif
+
         tempname = malloc(strlen(tempdir) + strlen(template) + 1);
         if (tempname == NULL)
                 return -1;
@@ -142,12 +153,6 @@ static int __init create_tmp_file(unsigned long long len)
         if (fd < 0)
                 exit(1);
 
-        err = fchmod(fd, 0777);
-        if (err < 0) {
-                perror("fchmod");
-                exit(1);
-        }
-
         /*
          * Seek to len - 1 because writing a character there will
          * increase the file size by one byte, to the desired length.
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index c211153ca69a..7801666514ed 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -62,6 +62,7 @@ static void sig_handler_common(int sig, struct siginfo *si, mcontext_t *mc)
 
 static int signals_enabled;
 static unsigned int signals_pending;
+static unsigned int signals_active = 0;
 
 void sig_handler(int sig, struct siginfo *si, mcontext_t *mc)
 {
@@ -101,7 +102,12 @@ void timer_alarm_handler(int sig, struct siginfo *unused_si, mcontext_t *mc)
 
         block_signals();
 
+        signals_active |= SIGALRM_MASK;
+
         timer_real_alarm_handler(mc);
+
+        signals_active &= ~SIGALRM_MASK;
+
         set_signals(enabled);
 }
 
@@ -286,8 +292,16 @@ void unblock_signals(void)
                 if (save_pending & SIGIO_MASK)
                         sig_handler_common(SIGIO, NULL, NULL);
 
-                if (save_pending & SIGALRM_MASK)
+                /* Do not reenter the handler */
+
+                if ((save_pending & SIGALRM_MASK) && (!(signals_active & SIGALRM_MASK)))
                         timer_real_alarm_handler(NULL);
+
+                /* Rerun the loop only if there is still pending SIGIO and not in TIMER handler */
+
+                if (!(signals_pending & SIGIO_MASK) && (signals_active & SIGALRM_MASK))
+                        return;
+
         }
 }
 
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index b856c66ebd3a..23025d645160 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -172,13 +172,6 @@ static void handle_trap(int pid, struct uml_pt_regs *regs,
         handle_syscall(regs);
 }
 
-int get_syscall(struct uml_pt_regs *regs)
-{
-        UPT_SYSCALL_NR(regs) = PT_SYSCALL_NR(regs->gp);
-
-        return UPT_SYSCALL_NR(regs);
-}
-
 extern char __syscall_stub_start[];
 
 static int userspace_tramp(void *stack)
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index 47f1ff056a54..22a358ef1b0c 100644
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -94,6 +94,8 @@ static int start_ptraced_child(void)
 {
         int pid, n, status;
 
+        fflush(stdout);
+
         pid = fork();
         if (pid == 0)
                 ptrace_child();