basic: set errno in raw_clone() on sparc

sparc sets the carry bit when a syscall fails. Use this information to
set errno and return -1 as appropriate.

The added test case calls raw_clone() with flags known to be invalid
according to the clone(2) manpage.

diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h
index d35540903ab30ec44de10ad1e7070d3d0f722f80..c801939d1945356ef0ff46e856e1f6d5c9346f43 100644 (file)
--- a/src/basic/raw-clone.h
+++ b/src/basic/raw-clone.h
@@ -8,6 +8,7 @@
   Copyright 2016 Michael Karcher
 ***/
 
+//#include <errno.h>
 #include <sched.h>
 #include <sys/syscall.h>
 
@@ -47,23 +48,28 @@ static inline pid_t raw_clone(unsigned long flags) {
                  * %o1. Inline assembly is needed to get the flag returned
                  * in %o1.
                  */
-                int in_child, child_pid;
+                int in_child, child_pid, error;
 
-                asm volatile("mov %2, %%g1\n\t"
-                             "mov %3, %%o0\n\t"
+                asm volatile("mov %3, %%g1\n\t"
+                             "mov %4, %%o0\n\t"
                              "mov 0 , %%o1\n\t"
 #if defined(__arch64__)
                              "t 0x6d\n\t"
 #else
                              "t 0x10\n\t"
 #endif
+                             "addx %%g0, 0, %2\n\t"
                              "mov %%o1, %0\n\t"
                              "mov %%o0, %1" :
-                             "=r"(in_child), "=r"(child_pid) :
+                             "=r"(in_child), "=r"(child_pid), "=r"(error) :
                              "i"(__NR_clone), "r"(flags) :
-                             "%o1", "%o0", "%g1" );
+                             "%o1", "%o0", "%g1" "cc" );
 
-                ret = in_child ? 0 : child_pid;
+                if (error) {
+                        errno = child_pid;
+                        ret = -1;
+                } else
+                        ret = in_child ? 0 : child_pid;
         }
 #else
         ret = (pid_t) syscall(__NR_clone, flags, NULL);

diff --git a/src/test/test-util.c b/src/test/test-util.c
index 9d31d5a869dabc106d69bb2f56bcd2084f3a719e..d8258007925e76a14bee8fd5d38f5e2f82a87f96 100644 (file)
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -215,6 +215,10 @@ static void test_raw_clone(void) {
                 waitpid(pid, &status, __WCLONE);
                 assert_se(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS);
         }
+
+        errno = 0;
+        assert_se(raw_clone(CLONE_FS|CLONE_NEWNS) == -1);
+        assert_se(errno == EINVAL);
 }
 #endif // 0