From 1f59c3b65eadaf1fed2b037e78b0913f85c0a717 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 30 May 2018 23:06:33 -0400 Subject: [PATCH] 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. --- src/basic/raw-clone.h | 18 ++++++++++++------ src/test/test-util.c | 4 ++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h index d35540903..c801939d1 100644 --- a/src/basic/raw-clone.h +++ b/src/basic/raw-clone.h @@ -8,6 +8,7 @@ Copyright 2016 Michael Karcher ***/ +//#include #include #include @@ -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 9d31d5a86..d82580079 100644 --- 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 -- 2.30.2