From patchwork Fri May 26 07:51:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13256570 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 227BBC7EE2D for ; Fri, 26 May 2023 07:51:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242533AbjEZHv0 (ORCPT ); Fri, 26 May 2023 03:51:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242512AbjEZHvY (ORCPT ); Fri, 26 May 2023 03:51:24 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F79E135; Fri, 26 May 2023 00:51:23 -0700 (PDT) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1685087481; bh=DkJgAJcAvtdVnot+t7IOseLE6pLBA89qfDYOzqzRxr4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lLn5Ra4UT5W+7hPi/W7hyftOnWvQtbYt+RnnVvKlguWzQzyC0CwMO2hGXzu6ur9yH qfmUquarnq6NgvYS+xMiQ8MFmMW45qi4cvdFJu3NugZ30I2j+u6vl7Wz5c3sc1gHEz 6DY8wQXm+P5v9F77hDDwcSJsc8sUYdW2ttJUKJJQ= Date: Fri, 26 May 2023 09:51:19 +0200 Subject: [PATCH v2 1/2] tools/nolibc: add support for prctl() MIME-Version: 1.0 Message-Id: <20230526-nolibc-test-no-dump-v2-1-a66500bf73fc@weissschuh.net> References: <20230526-nolibc-test-no-dump-v2-0-a66500bf73fc@weissschuh.net> In-Reply-To: <20230526-nolibc-test-no-dump-v2-0-a66500bf73fc@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1685087479; l=2797; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=DkJgAJcAvtdVnot+t7IOseLE6pLBA89qfDYOzqzRxr4=; b=1qmpuRz+hs8ZGEviZzteWWt0ML8v4Ia8/JBkYrADdw2L0sSJWamEoTw3a3mzpd35T6OfV0d2/ uvz8xMz4/LmC5SqdGi/Jv4+cymN2dC0aC+H8ojsYN0kyrYw8n7SMt0n X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org It will be used to disable core dumps from the child spawned to validate the stack protector functionality. Signed-off-by: Thomas Weißschuh --- tools/include/nolibc/sys.h | 27 +++++++++++++++++++++++++++ tools/testing/selftests/nolibc/nolibc-test.c | 2 ++ 2 files changed, 29 insertions(+) diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index 7874062bea95..3d521feffad6 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -22,6 +22,7 @@ #include /* for O_* and AT_* */ #include /* for statx() */ #include /* for LINUX_REBOOT_* */ +#include #include "arch.h" #include "errno.h" @@ -894,6 +895,32 @@ int open(const char *path, int flags, ...) } +/* + * int prctl(int option, unsigned long arg2, unsigned long arg3, + * unsigned long arg4, unsigned long arg5); + */ + +static __attribute__((unused)) +int sys_prctl(int option, unsigned long arg2, unsigned long arg3, + unsigned long arg4, unsigned long arg5) +{ + return my_syscall5(__NR_prctl, option, arg2, arg3, arg4, arg5); +} + +static __attribute__((unused)) +int prctl(int option, unsigned long arg2, unsigned long arg3, + unsigned long arg4, unsigned long arg5) +{ + int ret = sys_prctl(option, arg2, arg3, arg4, arg5); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + /* * int pivot_root(const char *new, const char *old); */ diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 6e0a4dbe321e..95ff2867a91d 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -580,6 +581,7 @@ int run_syscall(int min, int max) CASE_TEST(poll_null); EXPECT_SYSZR(1, poll(NULL, 0, 0)); break; CASE_TEST(poll_stdout); EXPECT_SYSNE(1, ({ struct pollfd fds = { 1, POLLOUT, 0}; poll(&fds, 1, 0); }), -1); break; CASE_TEST(poll_fault); EXPECT_SYSER(1, poll((void *)1, 1, 0), -1, EFAULT); break; + CASE_TEST(prctl); EXPECT_SYSER(1, prctl(PR_SET_NAME, (unsigned long)NULL, 0, 0, 0), -1, EFAULT); break; CASE_TEST(read_badf); EXPECT_SYSER(1, read(-1, &tmp, 1), -1, EBADF); break; CASE_TEST(sched_yield); EXPECT_SYSZR(1, sched_yield()); break; CASE_TEST(select_null); EXPECT_SYSZR(1, ({ struct timeval tv = { 0 }; select(0, NULL, NULL, NULL, &tv); })); break; From patchwork Fri May 26 07:51:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13256568 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0877AC77B7A for ; Fri, 26 May 2023 07:51:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242529AbjEZHvZ (ORCPT ); Fri, 26 May 2023 03:51:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242509AbjEZHvX (ORCPT ); Fri, 26 May 2023 03:51:23 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B127A12C; Fri, 26 May 2023 00:51:22 -0700 (PDT) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1685087480; bh=gPWy5ndLt8ct+Uazqw50nw4PJv+qz+MZWnYipjEuHg4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hS0Zhw49+9al2kcGPElURWIe30L2/bYj8kjizboi2kD8xqnP0LBrFnz83CKPrR42X SfK7Df3aVXH45ub41nImcZk3CcDZNB2Ggne5+avq1v+d4Ljrp1FdBv84xjAnLFqirN G+EzzKz+WFKD5/Tl0IhyKHp8BKZ/KvTgBYN3LB00= Date: Fri, 26 May 2023 09:51:20 +0200 Subject: [PATCH v2 2/2] selftests/nolibc: prevent coredumps during test execution MIME-Version: 1.0 Message-Id: <20230526-nolibc-test-no-dump-v2-2-a66500bf73fc@weissschuh.net> References: <20230526-nolibc-test-no-dump-v2-0-a66500bf73fc@weissschuh.net> In-Reply-To: <20230526-nolibc-test-no-dump-v2-0-a66500bf73fc@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1685087479; l=989; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=gPWy5ndLt8ct+Uazqw50nw4PJv+qz+MZWnYipjEuHg4=; b=A16KBhfIrmPXrI7A758j3aA9reNvLxMKPt3tolDoX8rZOSZw+NGQWP4roP4PFqUUkHl9iKw1f i/mOxuWmA9uDplYB3WGGUDFJw/6O37J6Hs8cEhEp8XykrOlNuipSP+m X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The child process forked during stackprotector tests intentionally gets killed with SIGABRT. By default this will trigger writing a coredump. The writing of the coredump can spam the systems coredump machinery and take some time. Timings for the full run of nolibc-test: Before: 200ms After: 20ms This is on a desktop x86 system with systemd-coredumpd enabled. Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/nolibc/nolibc-test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 95ff2867a91d..3296e8567fa5 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -831,6 +831,7 @@ static int run_protection(int min, int max) close(STDOUT_FILENO); close(STDERR_FILENO); + prctl(PR_SET_DUMPABLE, 0, 0, 0, 0); smash_stack(); return 1;