Commit-ID: 158b67b5c5ccda9b909f18028a3cd17185ca1efd Gitweb: http://git.kernel.org/tip/158b67b5c5ccda9b909f18028a3cd17185ca1efd Author: Andy Lutomirski <l...@kernel.org> AuthorDate: Tue, 3 May 2016 10:31:50 -0700 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Wed, 4 May 2016 08:34:13 +0200
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 <mi...@kernel.org> Signed-off-by: Andy Lutomirski <l...@kernel.org> Cc: Al Viro <v...@zeniv.linux.org.uk> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Andy Lutomirski <l...@amacapital.net> Cc: Borislav Petkov <b...@alien8.de> Cc: Brian Gerst <brge...@gmail.com> Cc: Denys Vlasenko <dvlas...@redhat.com> Cc: H. Peter Anvin <h...@zytor.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Oleg Nesterov <o...@redhat.com> Cc: Pavel Emelyanov <xe...@parallels.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Shuah Khan <shua...@osg.samsung.com> Cc: Stas Sergeev <s...@list.ru> Cc: Thomas Gleixner <t...@linutronix.de> Cc: linux-...@vger.kernel.org Link: http://lkml.kernel.org/r/f3e739bf435beeaecbd5f038f1359d2eac6d1e63.1462296606.git.l...@kernel.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- tools/testing/selftests/sigaltstack/sas.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/sigaltstack/sas.c b/tools/testing/selftests/sigaltstack/sas.c index 57da8bf..a98c3ef 100644 --- a/tools/testing/selftests/sigaltstack/sas.c +++ b/tools/testing/selftests/sigaltstack/sas.c @@ -15,6 +15,7 @@ #include <alloca.h> #include <string.h> #include <assert.h> +#include <errno.h> #ifndef SS_AUTODISARM #define SS_AUTODISARM (1 << 4) @@ -117,13 +118,19 @@ int main(void) stk.ss_flags = SS_ONSTACK | SS_AUTODISARM; err = sigaltstack(&stk, NULL); if (err) { - perror("[FAIL]\tsigaltstack(SS_ONSTACK | SS_AUTODISARM)"); - stk.ss_flags = SS_ONSTACK; - } - err = sigaltstack(&stk, NULL); - if (err) { - perror("[FAIL]\tsigaltstack(SS_ONSTACK)"); - return EXIT_FAILURE; + if (errno == EINVAL) { + printf("[NOTE]\tThe running kernel doesn't support SS_AUTODISARM\n"); + /* + * If test cases for the !SS_AUTODISARM variant were + * added, we could still run them. We don't have any + * test cases like that yet, so just exit and report + * success. + */ + return 0; + } else { + perror("[FAIL]\tsigaltstack(SS_ONSTACK | SS_AUTODISARM)"); + return EXIT_FAILURE; + } } ustack = mmap(NULL, SIGSTKSZ, PROT_READ | PROT_WRITE,
