From nobody Tue Dec 2 00:05:07 2025 Received: from canpmsgout03.his.huawei.com (canpmsgout03.his.huawei.com [113.46.200.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4E8D318143; Wed, 26 Nov 2025 07:15:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.218 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764141313; cv=none; b=Vy8/rYTx3Bk+F8XXRunOXYX4N+82RtRRXiZXlm2NyTuNU6JlWWcJ1VKxsVS3xpgZZD3YyKcyGlsZQxELatqqzWj5zgIOfy6N/1bX0AzJpQ5vsUL/k1h6plrx+77Ilj+3KpQAtwYqL7JpbnQBsrHq5pRoCFPX2oDAzwmsmTQtvLQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764141313; c=relaxed/simple; bh=TPKOrcymoq2jFPF0Dmjwu7bdKJWoN7iA5axwXrRuS5s=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MT1RE21VfQDgNuxo+74zrcNPx9qFy+rSmYWDBmyvZ9s2lktLE+cRuORVsbrhOlQ5HmwKQMqAnCTJ1cCMMPfdY8bWtQ/MBEicGTUXgxhfygQJAbjNVK8cqCj3Cc5p5+63UkfjRMCygU/n/nh6I22ojWp2i6laJGLOe1ABEq3KJhA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=NSeeJHOr; arc=none smtp.client-ip=113.46.200.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="NSeeJHOr" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=V44W4m8J5JFxpbM5DqCszxWUoMTdeU+99fMGD6YMMLo=; b=NSeeJHOrnZ7/BKFBZ9lOhzJWTMpz4yXrIhbM0DWDEGNWLu8m4Uq8ROFOLzigwK4ddAMBY7P3m pcGqR9i3JLBe+Z+L53o4ugNN/397DZKXBFwVf5oEeMo5rahg4RKvzXtGAz93afvmbrWEshOz5qi ych9DS9yC6letmEwEkKLxI0= Received: from mail.maildlp.com (unknown [172.19.88.105]) by canpmsgout03.his.huawei.com (SkyGuard) with ESMTPS id 4dGW3q6bRQzpTL1; Wed, 26 Nov 2025 15:12:55 +0800 (CST) Received: from dggpemf500011.china.huawei.com (unknown [7.185.36.131]) by mail.maildlp.com (Postfix) with ESMTPS id 767921402CF; Wed, 26 Nov 2025 15:15:02 +0800 (CST) Received: from huawei.com (10.90.53.73) by dggpemf500011.china.huawei.com (7.185.36.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 26 Nov 2025 15:15:00 +0800 From: Jinjie Ruan To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: Subject: [PATCH v8 06/12] arm64/ptrace: Return early for ptrace_report_syscall_entry() error Date: Wed, 26 Nov 2025 15:14:40 +0800 Message-ID: <20251126071446.3234218-7-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251126071446.3234218-1-ruanjinjie@huawei.com> References: <20251126071446.3234218-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems500002.china.huawei.com (7.221.188.17) To dggpemf500011.china.huawei.com (7.185.36.131) Content-Type: text/plain; charset="utf-8" The generic entry abort the syscall_trace_enter() sequence if ptrace_report_syscall_entry() errors out, but arm64 not. As the ptrace_report_syscall_entry() comment said, the calling arch code should abort the system call and must prevent normal entry so no system call is made if ptrace_report_syscall_entry() return nonzero. In preparation for moving arm64 over to the generic entry code, return early if ptrace_report_syscall_entry() encounters an error. Signed-off-by: Jinjie Ruan --- arch/arm64/kernel/ptrace.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 233a7688ac94..da9687d30bcf 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -2346,15 +2346,18 @@ static inline unsigned long ptrace_save_reg(struct = pt_regs *regs, return saved_reg; } =20 -static void report_syscall_entry(struct pt_regs *regs) +static int report_syscall_entry(struct pt_regs *regs) { unsigned long saved_reg; - int regno; + int regno, ret; =20 saved_reg =3D ptrace_save_reg(regs, PTRACE_SYSCALL_ENTER, ®no); - if (ptrace_report_syscall_entry(regs)) + ret =3D ptrace_report_syscall_entry(regs); + if (ret) forget_syscall(regs); regs->regs[regno] =3D saved_reg; + + return ret; } =20 static void report_syscall_exit(struct pt_regs *regs) @@ -2380,9 +2383,11 @@ static void report_syscall_exit(struct pt_regs *regs) =20 int syscall_trace_enter(struct pt_regs *regs, long syscall, unsigned long = flags) { + int ret; + if (flags & (_TIF_SYSCALL_EMU | _TIF_SYSCALL_TRACE)) { - report_syscall_entry(regs); - if (flags & _TIF_SYSCALL_EMU) + ret =3D report_syscall_entry(regs); + if (ret || (flags & _TIF_SYSCALL_EMU)) return NO_SYSCALL; } =20 --=20 2.34.1