From patchwork Tue Dec 3 09:30:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Celeste Liu X-Patchwork-Id: 13892047 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F3B44D73612 for ; Tue, 3 Dec 2024 09:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=N4oTyDIkFBVsiTbhyHBDq3chC6ASMXogSUAqJ6KGU/8=; b=AAUHM8LDknVeoh fpeObnWmIHe8kDNrTeVO7nwweYA1nAuVqQPw/K9eKkFm0RG26ueauf8SLccdmTJQPrHow+Dkqggmz 4orqIyBd+S9BDIi27ILYPzv+EMqQ4Nlq+quO/iod9OdI//QsF9vuHxgt387Kv7dL3Q+q7gsOsRNJI c4TA5trLi1cn9s/HFxbwcxzHoZgPevArwPRElyGRhtjtkkZw6QDHyzHQTec5SXbDlbitEoMep2dqU +TGbUSOpZYDo4XELifuby4THMuqyUZwmJ12m40THZJIJ+HhyJHYSSsfyqxFyxd30nnKfOz2w/NdbW IGvjBX9eJh00avmE+4/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tIPHg-00000008tf5-3vUM; Tue, 03 Dec 2024 09:33:32 +0000 Received: from flow-b2-smtp.messagingengine.com ([202.12.124.137]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tIPFN-00000008t61-1oFZ for linux-riscv@lists.infradead.org; Tue, 03 Dec 2024 09:31:10 +0000 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailflow.stl.internal (Postfix) with ESMTP id 3AFBB1D40996; Tue, 3 Dec 2024 04:31:08 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Tue, 03 Dec 2024 04:31:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= coelacanthus.name; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1733218268; x=1733221868; bh=TH5iUDtcVd 8w2RV5/BeTBVj9JapPNqfFOxuzY/m1AcE=; b=xzlU2rr4ohSa6VQcSxOxkMbISJ VqUnzWbMC2LFTIzpVR0w2szczBLATRHV5rCCJazN9RIFuYBcDRASVWcq4xeN3/Pc Ilong4t7YBu5KMLah/22yGCXn5EzpNWc6wDuyl8Xom+ploCaOcNo8xccpfGSynBr pPQRXvdhprvngNIPgq3b/oufCEcjERNwFHVdOoldJCA1BqpSanWWtjWT7vuM2/Rf fl3Eyijrnyc6bLS0EC1Mte2DLG7Yt/RKLGJ28BIMwJpUxSjcGMiwr/9SIwJceanK LR0kxxI6AWLwKF3/owfuagxLcABmE/dFKAMdUX4qs17tq5l1Mse5yFgUFzPg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1733218268; x= 1733221868; bh=TH5iUDtcVd8w2RV5/BeTBVj9JapPNqfFOxuzY/m1AcE=; b=z jkgOXnpDfYS+02R02SbuT0WWLpWVlRqUFduyqhIALXWk5meNkCdBpbV0/QE9fOiV nZQJszso81VuWM9c04ZnuseMb44mevydzWFNPtJqikkZ9SP0w76jVS0RCM5/1Zz+ DE/V+VBhO9WOQP0GofMo6mIGJxR4Asa8KkBE+oARPadljojA4vEiDoKkfMJCMlm9 P/hFel/DtHpk6HcDfZDyvh1FCdWcBEO0I17d1RMFnLjESsRpl5qhnhQrsKThOQqj 6oe21Hddj/utXn2kK+qTGjHmSemKTWnYMclt+YxT7FM7GFeQLrMVdDhgycTlDYzH yrRGN2uE9IdQ4N0j98iGA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddriedvgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeen ucfhrhhomhepvegvlhgvshhtvgcunfhiuhcuoehufihusegtohgvlhgrtggrnhhthhhush drnhgrmhgvqeenucggtffrrghtthgvrhhnpeeiteejtdevjeffgfehkeegfeelkeekvdeh tdegleevhfetheejheejiedtjeegteenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehufihusegtohgvlhgrtggrnhhthhhushdrnhgrmhgvpdhn sggprhgtphhtthhopedvjedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepuhifuh estghovghlrggtrghnthhhuhhsrdhnrghmvgdprhgtphhtthhopehsthgrsghlvgesvhhg vghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehshhhurghhsehkvghrnhgvlhdroh hrghdprhgtphhtthhopehprghulhdrfigrlhhmshhlvgihsehsihhfihhvvgdrtghomhdp rhgtphhtthhopehguhhorhgvnheskhgvrhhnvghlrdhorhhgpdhrtghpthhtohepkhgvvg hssehkvghrnhgvlhdrohhrghdprhgtphhtthhopeiiihihrghoseguihhsrhhoohhtrdho rhhgpdhrtghpthhtoheplhhinhhugidqkhhsvghlfhhtvghsthesvhhgvghrrdhkvghrnh gvlhdrohhrghdprhgtphhtthhopehlughvsehsthhrrggtvgdrihho X-ME-Proxy: Feedback-ID: i95c648bc:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 3 Dec 2024 04:31:05 -0500 (EST) From: Celeste Liu Date: Tue, 03 Dec 2024 17:30:05 +0800 Subject: [PATCH v2 2/2] riscv: selftests: Add a ptrace test to verify syscall parameter modification MIME-Version: 1.0 Message-Id: <20241203-riscv-new-regset-v2-2-d37da8c0cba6@coelacanthus.name> References: <20241203-riscv-new-regset-v2-0-d37da8c0cba6@coelacanthus.name> In-Reply-To: <20241203-riscv-new-regset-v2-0-d37da8c0cba6@coelacanthus.name> To: Oleg Nesterov , Paul Walmsley , Palmer Dabbelt , Albert Ou , Eric Biederman , Kees Cook , Shuah Khan Cc: Alexandre Ghiti , "Dmitry V. Levin" , Andrea Bolognani , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Thomas Gleixner , Ron Economos , Charlie Jenkins , Quan Zhou , Felix Yan , Ruizhe Pan , Shiqi Zhang , Guo Ren , Yao Zi , Han Gao , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org, linux-kselftest@vger.kernel.org, Celeste Liu X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5295; i=uwu@coelacanthus.name; h=from:subject:message-id; bh=RyjBj4yqY/cnYg3J7doc5uv1ZKvB6VdgX8fYxV3Chig=; b=owJ4nJvAy8zAJeafov85RWVtBeNptSSGdL/zJ9qO8P6x3TXF5oxE8YH8p38CcwSX8i+8s9py0 fsfT7r3XYnvKGVhEONikBVTZMkrYfnJeels996O7V0wc1iZQIYwcHEKwESO9zH8z768W5XxtXWQ Vd3MvL6tb6X6EhZWSzZ/OSGQZm/0+n7LI4Z/umbeB/ZzX/4WulioQH3HUSZFxvjP+l+UCuMusYl khdnxAQC3SUvH X-Developer-Key: i=uwu@coelacanthus.name; a=openpgp; fpr=892EBC7DC392DFF9C9C03F1D15F4180E73787863 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241203_013109_532199_4F2EE29E X-CRM114-Status: GOOD ( 19.29 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Charlie Jenkins This test checks that orig_a0 allows a syscall argument to be modified, and that changing a0 does not change the syscall argument. Cc: stable@vger.kernel.org Co-developed-by: Quan Zhou Signed-off-by: Quan Zhou Co-developed-by: Celeste Liu Signed-off-by: Celeste Liu Signed-off-by: Charlie Jenkins Reviewed-by: Björn Töpel --- tools/testing/selftests/riscv/abi/.gitignore | 1 + tools/testing/selftests/riscv/abi/Makefile | 5 +- tools/testing/selftests/riscv/abi/ptrace.c | 134 +++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/riscv/abi/.gitignore b/tools/testing/selftests/riscv/abi/.gitignore index b38358f91c4d2240ae64892871d9ca98bda1ae58..378c605919a3b3d58eec2701eb7af430cfe315d6 100644 --- a/tools/testing/selftests/riscv/abi/.gitignore +++ b/tools/testing/selftests/riscv/abi/.gitignore @@ -1 +1,2 @@ pointer_masking +ptrace diff --git a/tools/testing/selftests/riscv/abi/Makefile b/tools/testing/selftests/riscv/abi/Makefile index ed82ff9c664e7eb3f760cbab81fb957ff72579c5..3f74d059dfdcbce4d45d8ff618781ccea1419061 100644 --- a/tools/testing/selftests/riscv/abi/Makefile +++ b/tools/testing/selftests/riscv/abi/Makefile @@ -2,9 +2,12 @@ CFLAGS += -I$(top_srcdir)/tools/include -TEST_GEN_PROGS := pointer_masking +TEST_GEN_PROGS := pointer_masking ptrace include ../../lib.mk $(OUTPUT)/pointer_masking: pointer_masking.c $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ + +$(OUTPUT)/ptrace: ptrace.c + $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ diff --git a/tools/testing/selftests/riscv/abi/ptrace.c b/tools/testing/selftests/riscv/abi/ptrace.c new file mode 100644 index 0000000000000000000000000000000000000000..d192764b428d1f1c442f3957c6fedeb01a48d556 --- /dev/null +++ b/tools/testing/selftests/riscv/abi/ptrace.c @@ -0,0 +1,134 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../kselftest_harness.h" + +#define ORIG_A0_MODIFY 0x01 +#define A0_MODIFY 0x02 +#define A0_OLD 0x03 +#define A0_NEW 0x04 + +#define perr_and_exit(fmt, ...) \ + ({ \ + char buf[256]; \ + snprintf(buf, sizeof(buf), "%s:%d:" fmt ": %m\n", \ + __func__, __LINE__, ##__VA_ARGS__); \ + perror(buf); \ + exit(-1); \ + }) + +static inline void resume_and_wait_tracee(pid_t pid, int flag) +{ + int status; + + if (ptrace(flag, pid, 0, 0)) + perr_and_exit("failed to resume the tracee %d\n", pid); + + if (waitpid(pid, &status, 0) != pid) + perr_and_exit("failed to wait for the tracee %d\n", pid); +} + +static void ptrace_test(int opt, int *result) +{ + int status; + pid_t pid; + struct user_regs_struct regs; + struct iovec iov = { + .iov_base = ®s, + .iov_len = sizeof(regs), + }; + + unsigned long orig_a0; + struct iovec a0_iov = { + .iov_base = &orig_a0, + .iov_len = sizeof(orig_a0), + }; + + pid = fork(); + if (pid == 0) { + /* Mark oneself being traced */ + long val = ptrace(PTRACE_TRACEME, 0, 0, 0); + + if (val) + perr_and_exit("failed to request for tracer to trace me: %ld\n", val); + + kill(getpid(), SIGSTOP); + + /* Perform exit syscall that will be intercepted */ + exit(A0_OLD); + } + + if (pid < 0) + exit(1); + + if (waitpid(pid, &status, 0) != pid) + perr_and_exit("failed to wait for the tracee %d\n", pid); + + /* Stop at the entry point of the syscall */ + resume_and_wait_tracee(pid, PTRACE_SYSCALL); + + /* Check tracee regs before the syscall */ + if (ptrace(PTRACE_GETREGSET, pid, NT_PRSTATUS, &iov)) + perr_and_exit("failed to get tracee registers\n"); + if (ptrace(PTRACE_GETREGSET, pid, NT_RISCV_ORIG_A0, &a0_iov)) + perr_and_exit("failed to get tracee registers\n"); + if (orig_a0 != A0_OLD) + perr_and_exit("unexpected orig_a0: 0x%lx\n", orig_a0); + + /* Modify a0/orig_a0 for the syscall */ + switch (opt) { + case A0_MODIFY: + regs.a0 = A0_NEW; + break; + case ORIG_A0_MODIFY: + orig_a0 = A0_NEW; + break; + } + + if (ptrace(PTRACE_SETREGSET, pid, NT_RISCV_ORIG_A0, &a0_iov)) + perr_and_exit("failed to set tracee registers\n"); + + /* Resume the tracee */ + ptrace(PTRACE_CONT, pid, 0, 0); + if (waitpid(pid, &status, 0) != pid) + perr_and_exit("failed to wait for the tracee\n"); + + *result = WEXITSTATUS(status); +} + +TEST(ptrace_modify_a0) +{ + int result; + + ptrace_test(A0_MODIFY, &result); + + /* The modification of a0 cannot affect the first argument of the syscall */ + EXPECT_EQ(A0_OLD, result); +} + +TEST(ptrace_modify_orig_a0) +{ + int result; + + ptrace_test(ORIG_A0_MODIFY, &result); + + /* Only modify orig_a0 to change the first argument of the syscall */ + EXPECT_EQ(A0_NEW, result); +} + +TEST_HARNESS_MAIN