Don't clobber esp
Including esp in the clobbers list is deprecated and
can silently trigger code generation errors (observed
with Android ndk r20 clang).
Fortunately, all the asm templates properly restore
esp, so there's no need to include it in clobbers.
Also add some tests for sys_rt_sigaction.
Bug: https://gcc.gnu.org/PR52813
Bug: crashpad:265
Change-Id: I8317202c115c28ce49a0cb05949babc43b90a274
Reviewed-on: https://chromium-review.googlesource.com/c/linux-syscall-support/+/2151097
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/linux_syscall_support.h b/linux_syscall_support.h
index a177cfb..a087903 100644
--- a/linux_syscall_support.h
+++ b/linux_syscall_support.h
@@ -1962,7 +1962,7 @@
LSS_ENTRYPOINT \
"pop %%ebx" \
args \
- : "esp", "memory"); \
+ : "memory"); \
LSS_RETURN(type,__res)
#undef _syscall0
#define _syscall0(type,name) \
@@ -2019,7 +2019,7 @@
: "i" (__NR_##name), "ri" ((long)(arg1)), \
"c" ((long)(arg2)), "d" ((long)(arg3)), \
"S" ((long)(arg4)), "D" ((long)(arg5)) \
- : "esp", "memory"); \
+ : "memory"); \
LSS_RETURN(type,__res); \
}
#undef _syscall6
@@ -2041,7 +2041,7 @@
: "i" (__NR_##name), "0" ((long)(&__s)), \
"c" ((long)(arg2)), "d" ((long)(arg3)), \
"S" ((long)(arg4)), "D" ((long)(arg5)) \
- : "esp", "memory"); \
+ : "memory"); \
LSS_RETURN(type,__res); \
}
LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
@@ -2127,7 +2127,7 @@
: "0"(-EINVAL), "i"(__NR_clone),
"m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
"m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
- : "esp", "memory", "ecx", "edx", "esi", "edi");
+ : "memory", "ecx", "edx", "esi", "edi");
LSS_RETURN(int, __res);
}
diff --git a/tests/Makefile b/tests/Makefile
index 5e37345..bcf7e1f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -41,6 +41,7 @@
TESTS = \
fallocate \
+ sigaction \
sigtimedwait \
unlink \
diff --git a/tests/sigaction.c b/tests/sigaction.c
new file mode 100644
index 0000000..f247aca
--- /dev/null
+++ b/tests/sigaction.c
@@ -0,0 +1,54 @@
+/* Copyright 2020, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "test_skel.h"
+
+void test_handler(int sig) {}
+
+int main(int argc, char *argv[]) {
+ const size_t kSigsetSize = sizeof(struct kernel_sigset_t);
+ struct kernel_sigaction action = {};
+ // Invalid signal returns EINVAL.
+ assert(sys_rt_sigaction(SIGKILL, &action, NULL, kSigsetSize) == -1);
+ assert(errno == EINVAL);
+
+ // Set an action.
+ action.sa_handler_ = test_handler;
+ action.sa_flags = SA_SIGINFO;
+ assert(sys_sigemptyset(&action.sa_mask) == 0);
+ assert(sys_sigaddset(&action.sa_mask, SIGPIPE) == 0);
+ assert(sys_rt_sigaction(SIGSEGV, &action, NULL, kSigsetSize) == 0);
+
+ // Retrieve the action.
+ struct kernel_sigaction old_action = {};
+ assert(sys_rt_sigaction(SIGSEGV, NULL, &old_action, kSigsetSize) == 0);
+ assert(memcmp(&action, &old_action, sizeof(action)) == 0);
+
+ return 0;
+}
