From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757075AbcEDHOg (ORCPT ); Wed, 4 May 2016 03:14:36 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37190 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751378AbcEDHOf (ORCPT ); Wed, 4 May 2016 03:14:35 -0400 Date: Wed, 4 May 2016 00:13:07 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: luto@kernel.org, shuahkh@osg.samsung.com, akpm@linux-foundation.org, bp@alien8.de, brgerst@gmail.com, oleg@redhat.com, peterz@infradead.org, tglx@linutronix.de, hpa@zytor.com, dvlasenk@redhat.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, mingo@kernel.org, luto@amacapital.net, xemul@parallels.com, stsp@list.ru, viro@zeniv.linux.org.uk Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, xemul@parallels.com, viro@zeniv.linux.org.uk, stsp@list.ru, dvlasenk@redhat.com, torvalds@linux-foundation.org, oleg@redhat.com, tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com, luto@kernel.org, shuahkh@osg.samsung.com, akpm@linux-foundation.org, bp@alien8.de, brgerst@gmail.com In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:core/signals] selftests/sigaltstack: Fix the sigaltstack test on old kernels Git-Commit-ID: 158b67b5c5ccda9b909f18028a3cd17185ca1efd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 158b67b5c5ccda9b909f18028a3cd17185ca1efd Gitweb: http://git.kernel.org/tip/158b67b5c5ccda9b909f18028a3cd17185ca1efd Author: Andy Lutomirski AuthorDate: Tue, 3 May 2016 10:31:50 -0700 Committer: Ingo Molnar 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 Signed-off-by: Andy Lutomirski Cc: Al Viro Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Pavel Emelyanov Cc: Peter Zijlstra Cc: Shuah Khan Cc: Stas Sergeev Cc: Thomas Gleixner Cc: linux-api@vger.kernel.org Link: http://lkml.kernel.org/r/f3e739bf435beeaecbd5f038f1359d2eac6d1e63.1462296606.git.luto@kernel.org Signed-off-by: Ingo Molnar --- 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 #include #include +#include #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,