From mboxrd@z Thu Jan 1 00:00:00 1970 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 28D5BE8782A for ; Tue, 3 Feb 2026 13:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rA5PDoRRW0nyf0Ob40TZcTkk7U3DIk1nYVoEtYBGC9M=; b=wMKDcMkKBAfzlWTxl2zD860p1g e4iZMlGRSFNY+b4hFm00s1WHOQdVsY1sRL77G2azlw2AdH7f9IL2XvfTlu19ZmA/VYYwXum76ixOo GtDqJcGPtNQ/6c/cFD6u5ROyTPCA42J1PqbHOOFTCHXhErQ+vFvlhFm7CAmA/QSXjBa7goIz4YrsH w8pr96dZxnpqpHelmCqxfQuZg4rGke82q+DV4XwwUlyb5qfJEyT+HgvNMlOqOVHr89lwBHJvia1um m3yX4gCftEq3x5CpGStt37ZT4b27B9zQULZiH9movz5wb0n54yzPTxN1NagpSVU50nF6V6ELh/y0V xe/0GwbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vnGam-00000006fzC-1Yk8; Tue, 03 Feb 2026 13:37:20 +0000 Received: from canpmsgout07.his.huawei.com ([113.46.200.222]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vnGak-00000006fwo-0rP8 for linux-arm-kernel@lists.infradead.org; Tue, 03 Feb 2026 13:37:19 +0000 dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=rA5PDoRRW0nyf0Ob40TZcTkk7U3DIk1nYVoEtYBGC9M=; b=uWAf7za8xonzhYvQ1FXHJHUi0h59nb/kCdMsIENx48i9EQgZHuPcydKSzNGZ6aGIVS0tVvaqJ mTpNvt99QTyEk0K8IX67czXkpmQDLn3h0PZjXj2XoYVpi0c4Kg+K7w1Bgkn/FCii9GPZfQFSGle RJiGJCEG5MfvXwwfGrzsHn4= Received: from mail.maildlp.com (unknown [172.19.162.92]) by canpmsgout07.his.huawei.com (SkyGuard) with ESMTPS id 4f54D61cBQzLlTs; Tue, 3 Feb 2026 21:32:38 +0800 (CST) Received: from dggpemf500011.china.huawei.com (unknown [7.185.36.131]) by mail.maildlp.com (Postfix) with ESMTPS id B12AD40565; Tue, 3 Feb 2026 21:37:11 +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; Tue, 3 Feb 2026 21:37:09 +0800 From: Jinjie Ruan To: , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: Subject: [PATCH v12 05/13] arm64/ptrace: Expand secure_computing() in place Date: Tue, 3 Feb 2026 21:37:20 +0800 Message-ID: <20260203133728.848283-6-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260203133728.848283-1-ruanjinjie@huawei.com> References: <20260203133728.848283-1-ruanjinjie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To dggpemf500011.china.huawei.com (7.185.36.131) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260203_053718_406027_5681934F X-CRM114-Status: GOOD ( 11.14 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The generic entry expand secure_computing() in place and call __secure_computing() directly. In order to switch to the generic entry for arm64, refactor secure_computing() for syscall_trace_enter(). No functional changes. Reviewed-by: Kevin Brodsky Signed-off-by: Jinjie Ruan --- arch/arm64/kernel/ptrace.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 9f9aa3087c09..5a7e97e94358 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -2419,8 +2419,11 @@ int syscall_trace_enter(struct pt_regs *regs, unsigned long flags) } /* Do the secure computing after ptrace; failures should be fast. */ - if (secure_computing() == -1) - return NO_SYSCALL; + if (flags & _TIF_SECCOMP) { + ret = __secure_computing(); + if (ret == -1) + return NO_SYSCALL; + } /* Either of the above might have changed the syscall number */ syscall = syscall_get_nr(current, regs); @@ -2438,7 +2441,7 @@ int syscall_trace_enter(struct pt_regs *regs, unsigned long flags) audit_syscall_entry(syscall, regs->orig_x0, regs->regs[1], regs->regs[2], regs->regs[3]); - return syscall; + return ret ? : syscall; } void syscall_trace_exit(struct pt_regs *regs, unsigned long flags) -- 2.34.1