From patchwork Fri May 26 06:30:35 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: 13256450 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 DF78AC7EE2F for ; Fri, 26 May 2023 06:30:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242147AbjEZGap (ORCPT ); Fri, 26 May 2023 02:30:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236693AbjEZGam (ORCPT ); Fri, 26 May 2023 02:30:42 -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 0681F125; Thu, 25 May 2023 23:30:40 -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=1685082638; bh=feE5GF7sSHQYQ5FSqkLvKWbBOiMTo93SuVWHmjxyeJw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ExDchs/ZRrFRV4v4wSML7GCpmB6CbFZGI2pFOKySq4/R0XYKv7NO8qhMUdcp59qLM yO8jj0Hy//LPUkI5AY35Pkm2YrSP9OhcTGdAlRfU5HjjiuaU1Dqf5SgbthmSyQHeeq hxEa+6eGi0g96TcsnBAmXJRdKGIwG+8+w3ks5iyI= Date: Fri, 26 May 2023 08:30:35 +0200 Subject: [PATCH 1/2] tools/nolibc: add support for prctl() MIME-Version: 1.0 Message-Id: <20230526-nolibc-test-no-dump-v1-1-62e724a96db2@weissschuh.net> References: <20230526-nolibc-test-no-dump-v1-0-62e724a96db2@weissschuh.net> In-Reply-To: <20230526-nolibc-test-no-dump-v1-0-62e724a96db2@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=1685082637; l=2782; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=feE5GF7sSHQYQ5FSqkLvKWbBOiMTo93SuVWHmjxyeJw=; b=rKi2UVvspxLdWtiD9wtKUzt6GsxOe7oxvaliatgqOG70KqJoHRv8LLJbfWoAcJjMUfpGU/10R d43FqGOGdnOAE2UR81CMJvQezwmf0cO5fuBibGQmBn7BMVjw9uZgnRs 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..76a9a0f362b1 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, 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 06:30:36 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: 13256449 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 9D6B5C77B7A for ; Fri, 26 May 2023 06:30:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242120AbjEZGap (ORCPT ); Fri, 26 May 2023 02:30:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236721AbjEZGam (ORCPT ); Fri, 26 May 2023 02:30:42 -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 07100198; Thu, 25 May 2023 23:30:40 -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=1685082638; bh=xblaIv9ff9aMttaZ5noLw4QKOmOsHQttyPbx4HeNkGU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=aBIaTe/p6JjQq0FT0W+hke0XP4+ZW+GxSk6KU6/wqI5+NnjucL48g8oRUYy796ItH uFZwmXMYa8ydKVYECSB6NE2uaj7rUdmGqVL7b8SOMWCk2VLcqr+x6+WtODwc/oIiq0 lX3YXgUhR0ItTKAb3cTj7u+mFWIzxKde7HXj+LM8= Date: Fri, 26 May 2023 08:30:36 +0200 Subject: [PATCH 2/2] selftests/nolibc: prevent coredumps during test execution MIME-Version: 1.0 Message-Id: <20230526-nolibc-test-no-dump-v1-2-62e724a96db2@weissschuh.net> References: <20230526-nolibc-test-no-dump-v1-0-62e724a96db2@weissschuh.net> In-Reply-To: <20230526-nolibc-test-no-dump-v1-0-62e724a96db2@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=1685082638; l=989; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=xblaIv9ff9aMttaZ5noLw4QKOmOsHQttyPbx4HeNkGU=; b=W55tJ8CzyJL4M+FVgABk9pXBCFnXHrsLH3hnToGetBqPIwwwEBcGilciGbU+vX0BxHEW6SDlp +UPfiRhJkvDBYitn3jrkk6fitFufRaPCD1xjQISCxuhD/S9qRZBuUxX 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 76a9a0f362b1..40fb684eaac9 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;