diff options
author | Andy Lutomirski <luto@kernel.org> | 2016-05-03 13:31:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-04 02:34:13 -0400 |
commit | 158b67b5c5ccda9b909f18028a3cd17185ca1efd (patch) | |
tree | b0b742cd3d36cb10186c3b20c9d76f5a0bcebf43 | |
parent | c876eeab6432687846d4cd5fe1e43dbc348de134 (diff) |
selftests/sigaltstack: Fix the sigaltstack test on old kernels
The handling for old kernels was wrong, resulting in a segfault. Fix it.
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Cc: Stas Sergeev <stsp@list.ru>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-api@vger.kernel.org
Link: http://lkml.kernel.org/r/f3e739bf435beeaecbd5f038f1359d2eac6d1e63.1462296606.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | tools/testing/selftests/sigaltstack/sas.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/tools/testing/selftests/sigaltstack/sas.c b/tools/testing/selftests/sigaltstack/sas.c index 57da8bfde60b..a98c3ef8141f 100644 --- a/tools/testing/selftests/sigaltstack/sas.c +++ b/tools/testing/selftests/sigaltstack/sas.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <alloca.h> | 15 | #include <alloca.h> |
16 | #include <string.h> | 16 | #include <string.h> |
17 | #include <assert.h> | 17 | #include <assert.h> |
18 | #include <errno.h> | ||
18 | 19 | ||
19 | #ifndef SS_AUTODISARM | 20 | #ifndef SS_AUTODISARM |
20 | #define SS_AUTODISARM (1 << 4) | 21 | #define SS_AUTODISARM (1 << 4) |
@@ -117,13 +118,19 @@ int main(void) | |||
117 | stk.ss_flags = SS_ONSTACK | SS_AUTODISARM; | 118 | stk.ss_flags = SS_ONSTACK | SS_AUTODISARM; |
118 | err = sigaltstack(&stk, NULL); | 119 | err = sigaltstack(&stk, NULL); |
119 | if (err) { | 120 | if (err) { |
120 | perror("[FAIL]\tsigaltstack(SS_ONSTACK | SS_AUTODISARM)"); | 121 | if (errno == EINVAL) { |
121 | stk.ss_flags = SS_ONSTACK; | 122 | printf("[NOTE]\tThe running kernel doesn't support SS_AUTODISARM\n"); |
122 | } | 123 | /* |
123 | err = sigaltstack(&stk, NULL); | 124 | * If test cases for the !SS_AUTODISARM variant were |
124 | if (err) { | 125 | * added, we could still run them. We don't have any |
125 | perror("[FAIL]\tsigaltstack(SS_ONSTACK)"); | 126 | * test cases like that yet, so just exit and report |
126 | return EXIT_FAILURE; | 127 | * success. |
128 | */ | ||
129 | return 0; | ||
130 | } else { | ||
131 | perror("[FAIL]\tsigaltstack(SS_ONSTACK | SS_AUTODISARM)"); | ||
132 | return EXIT_FAILURE; | ||
133 | } | ||
127 | } | 134 | } |
128 | 135 | ||
129 | ustack = mmap(NULL, SIGSTKSZ, PROT_READ | PROT_WRITE, | 136 | ustack = mmap(NULL, SIGSTKSZ, PROT_READ | PROT_WRITE, |