9 files changed, 81 insertions, 40 deletions

diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index 3bd10deea280..09251338d99e 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -171,7 +171,7 @@ int os_sigio_async(int master, int slave)
 
         flags = fcntl(master, F_GETFL);
         if(flags < 0)
-                return errno;
+                return -errno;
 
         if((fcntl(master, F_SETFL, flags | O_NONBLOCK | O_ASYNC) < 0) ||
            (fcntl(master, F_SETOWN, os_getpid()) < 0))
diff --git a/arch/um/os-Linux/irq.c b/arch/um/os-Linux/irq.c
index e599be423da1..3788d4568d33 100644
--- a/arch/um/os-Linux/irq.c
+++ b/arch/um/os-Linux/irq.c
@@ -29,21 +29,21 @@ int os_waiting_for_events(struct irq_fd *active_fds)
         int i, n, err;
 
         n = poll(pollfds, pollfds_num, 0);
-        if(n < 0){
+        if (n < 0) {
                 err = -errno;
-                if(errno != EINTR)
+                if (errno != EINTR)
                         printk("sigio_handler: os_waiting_for_events:"
                                " poll returned %d, errno = %d\n", n, errno);
                 return err;
         }
 
-        if(n == 0)
+        if (n == 0)
                 return 0;
 
         irq_fd = active_fds;
 
-        for(i = 0; i < pollfds_num; i++){
-                if(pollfds[i].revents != 0){
+        for (i = 0; i < pollfds_num; i++) {
+                if (pollfds[i].revents != 0) {
                         irq_fd->current_events = pollfds[i].revents;
                         pollfds[i].fd = -1;
                 }
@@ -54,7 +54,7 @@ int os_waiting_for_events(struct irq_fd *active_fds)
 
 int os_isatty(int fd)
 {
-        return(isatty(fd));
+        return isatty(fd);
 }
 
 int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds)
@@ -65,7 +65,7 @@ int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds)
                         return((pollfds_size + 1) * sizeof(pollfds[0]));
                 }
 
-                if(pollfds != NULL){
+                if (pollfds != NULL) {
                         memcpy(tmp_pfd, pollfds,
                                sizeof(pollfds[0]) * pollfds_size);
                         /* remove old pollfds */
@@ -73,18 +73,15 @@ int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds)
                 }
                 pollfds = tmp_pfd;
                 pollfds_size++;
-        } else {
-                /* remove not used tmp_pfd */
-                if (tmp_pfd != NULL)
-                        kfree(tmp_pfd);
-        }
+        } else
+                kfree(tmp_pfd); /* remove not used tmp_pfd */
 
-        pollfds[pollfds_num] = ((struct pollfd) { .fd   = fd,
-                                                  .events       = events,
-                                                  .revents      = 0 });
+        pollfds[pollfds_num] = ((struct pollfd) { .fd           = fd,
+                                                  .events       = events,
+                                                  .revents      = 0 });
         pollfds_num++;
 
-        return(0);
+        return 0;
 }
 
 void os_free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg,
@@ -94,11 +91,11 @@ void os_free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg,
         int i = 0;
 
         prev = &active_fds;
-        while(*prev != NULL){
-                if((*test)(*prev, arg)){
+        while (*prev != NULL) {
+                if ((*test)(*prev, arg)) {
                         struct irq_fd *old_fd = *prev;
-                        if((pollfds[i].fd != -1) &&
-                           (pollfds[i].fd != (*prev)->fd)){
+                        if ((pollfds[i].fd != -1) &&
+                            (pollfds[i].fd != (*prev)->fd)) {
                                 printk("os_free_irq_by_cb - mismatch between "
                                        "active_fds and pollfds, fd %d vs %d\n",
                                        (*prev)->fd, pollfds[i].fd);
@@ -110,7 +107,6 @@ void os_free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg,
                         /* This moves the *whole* array after pollfds[i]
                          * (though it doesn't spot as such)!
                          */
-
                         memmove(&pollfds[i], &pollfds[i + 1],
                                (pollfds_num - i) * sizeof(pollfds[0]));
                         if(*last_irq_ptr2 == &old_fd->next)
@@ -129,10 +125,9 @@ void os_free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg,
         return;
 }
 
-
 int os_get_pollfd(int i)
 {
-        return(pollfds[i].fd);
+        return pollfds[i].fd;
 }
 
 void os_set_pollfd(int i, int fd)
@@ -151,8 +146,10 @@ void init_irq_signals(int on_sigstack)
         int flags;
 
         flags = on_sigstack ? SA_ONSTACK : 0;
-        if(timer_irq_inited) h = (__sighandler_t) alarm_handler;
-        else h = boot_timer_handler;
+        if (timer_irq_inited)
+                h = (__sighandler_t)alarm_handler;
+        else
+                h = boot_timer_handler;
 
         set_handler(SIGVTALRM, h, flags | SA_RESTART,
                     SIGUSR1, SIGIO, SIGWINCH, SIGALRM, -1);
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index 2878e89a674f..3a0ac38e978b 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -74,6 +74,34 @@ static void last_ditch_exit(int sig)
         exit(1);
 }
 
+#define UML_LIB_PATH    ":/usr/lib/uml"
+
+static void setup_env_path(void)
+{
+        char *new_path = NULL;
+        char *old_path = NULL;
+        int path_len = 0;
+
+        old_path = getenv("PATH");
+        /* if no PATH variable is set or it has an empty value
+         * just use the default + /usr/lib/uml
+         */
+        if (!old_path || (path_len = strlen(old_path)) == 0) {
+                putenv("PATH=:/bin:/usr/bin/" UML_LIB_PATH);
+                return;
+        }
+
+        /* append /usr/lib/uml to the existing path */
+        path_len += strlen("PATH=" UML_LIB_PATH) + 1;
+        new_path = malloc(path_len);
+        if (!new_path) {
+                perror("coudn't malloc to set a new PATH");
+                return;
+        }
+        snprintf(new_path, path_len, "PATH=%s" UML_LIB_PATH, old_path);
+        putenv(new_path);
+}
+
 extern int uml_exitcode;
 
 extern void scan_elf_aux( char **envp);
@@ -114,6 +142,8 @@ int main(int argc, char **argv, char **envp)
 
         set_stklim();
 
+        setup_env_path();
+
         new_argv = malloc((argc + 1) * sizeof(char *));
         if(new_argv == NULL){
                 perror("Mallocing argv");
diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
index 3505f44f8a25..233be2f4f8cb 100644
--- a/arch/um/os-Linux/process.c
+++ b/arch/um/os-Linux/process.c
@@ -206,29 +206,36 @@ int os_drop_memory(void *addr, int length)
 int can_drop_memory(void)
 {
         void *addr;
-        int fd;
+        int fd, ok = 0;
 
         printk("Checking host MADV_REMOVE support...");
         fd = create_mem_file(UM_KERN_PAGE_SIZE);
         if(fd < 0){
                 printk("Creating test memory file failed, err = %d\n", -fd);
-                return 0;
+                goto out;
         }
 
         addr = mmap64(NULL, UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE,
                       MAP_SHARED, fd, 0);
         if(addr == MAP_FAILED){
                 printk("Mapping test memory file failed, err = %d\n", -errno);
-                return 0;
+                goto out_close;
         }
 
         if(madvise(addr, UM_KERN_PAGE_SIZE, MADV_REMOVE) != 0){
                 printk("MADV_REMOVE failed, err = %d\n", -errno);
-                return 0;
+                goto out_unmap;
         }
 
         printk("OK\n");
-        return 1;
+        ok = 1;
+
+out_unmap:
+        munmap(addr, UM_KERN_PAGE_SIZE);
+out_close:
+        close(fd);
+out:
+        return ok;
 }
 
 void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int))
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index 0776bc18ca85..bd89c6b99d5d 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -344,12 +344,12 @@ int copy_context_skas0(unsigned long new_stack, int pid)
         err = ptrace_setregs(pid, regs);
         if(err < 0)
                 panic("copy_context_skas0 : PTRACE_SETREGS failed, "
-                      "pid = %d, errno = %d\n", pid, errno);
+                      "pid = %d, errno = %d\n", pid, -err);
 
         err = ptrace_setfpregs(pid, fp_regs);
         if(err < 0)
                 panic("copy_context_skas0 : PTRACE_SETFPREGS failed, "
-                      "pid = %d, errno = %d\n", pid, errno);
+                      "pid = %d, errno = %d\n", pid, -err);
 
         /* set a well known return code for detection of child write failure */
         child_data->err = 12345678;
@@ -362,7 +362,7 @@ int copy_context_skas0(unsigned long new_stack, int pid)
         pid = data->err;
         if(pid < 0)
                 panic("copy_context_skas0 - stub-parent reports error %d\n",
-                      pid);
+                      -pid);
 
         /* Wait, until child has finished too: read child's result from
          * child's stack and check it.
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c
index 7a6f6b99ceff..516f66dd87e3 100644
--- a/arch/um/os-Linux/sys-i386/registers.c
+++ b/arch/um/os-Linux/sys-i386/registers.c
@@ -104,7 +104,7 @@ void init_registers(int pid)
         err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
         if(err)
                 panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
-                      err);
+                      errno);
 
         errno = 0;
         err = ptrace(PTRACE_GETFPXREGS, pid, 0, exec_fpx_regs);
@@ -119,7 +119,7 @@ void init_registers(int pid)
         err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);
         if(err)
                 panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",
-                      err);
+                      errno);
 }
 
 void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
diff --git a/arch/um/os-Linux/sys-x86_64/registers.c b/arch/um/os-Linux/sys-x86_64/registers.c
index 001941fa1a1e..becd898d9398 100644
--- a/arch/um/os-Linux/sys-x86_64/registers.c
+++ b/arch/um/os-Linux/sys-x86_64/registers.c
@@ -62,12 +62,12 @@ void init_registers(int pid)
         err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
         if(err)
                 panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
-                      err);
+                      errno);
 
         err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);
         if(err)
                 panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",
-                      err);
+                      errno);
 }
 
 void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c
index 34bfc1bb9e38..362db059fe30 100644
--- a/arch/um/os-Linux/umid.c
+++ b/arch/um/os-Linux/umid.c
@@ -178,14 +178,14 @@ static void __init create_pid_file(void)
         fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0644);
         if(fd < 0){
                 printk("Open of machine pid file \"%s\" failed: %s\n",
-                       file, strerror(-fd));
+                       file, strerror(errno));
                 return;
         }
 
         snprintf(pid, sizeof(pid), "%d\n", getpid());
         n = write(fd, pid, strlen(pid));
         if(n != strlen(pid))
-                printk("Write of pid file failed - err = %d\n", -n);
+                printk("Write of pid file failed - err = %d\n", errno);
 
         close(fd);
 }
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 2598158e1f53..3f33165ada68 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -96,6 +96,13 @@ EXPORT_SYMBOL_PROTO(getuid);
 EXPORT_SYMBOL_PROTO(fsync);
 EXPORT_SYMBOL_PROTO(fdatasync);
 
+/* Export symbols used by GCC for the stack protector. */
+extern void __stack_smash_handler(void *) __attribute__((weak));
+EXPORT_SYMBOL(__stack_smash_handler);
+
+extern long __guard __attribute__((weak));
+EXPORT_SYMBOL(__guard);
+
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically