From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E1962F5474 for ; Thu, 25 Jun 2026 10:45:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782384316; cv=none; b=cUyppBWtcIBq52ZPI9dbiI+2RgP1tSl7Rp5SEZKwdZo0A1xitYsDNlhNb6oDqVgbB2/dOJENfQ6z93F7L/ldIRmQ0RJxnc82od1pITy0nAV+55u5Bja2CCupyaX+P9ZoKCYEA1YjJiFP2CUtm/AMAt7h9kZRW8xAygPbYK9bh+8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782384316; c=relaxed/simple; bh=CUiVMSk6CXgG2Xclccs4QXcEUunw0Ana+R6dPAU+Oiw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TtdpVSVnXwSPbvGSReG0FlUNiqpPc6D0Kli6cqOr4AyRG2EgK/mSLnXVpHVg9ZxvhyWzlgVTmUBZK9szsIIJQqn9LQCkk7JuaWYmE0V0HYkXcznJaQVqbrhV9HOXmsIXYQSh4VOewp1nsC3tV8uf7qkLZLMWDXyAxbEdv0kUzZc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b/pqM2/d; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b/pqM2/d" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-37c5dabff14so256388a91.0 for ; Thu, 25 Jun 2026 03:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782384315; x=1782989115; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=0a7qUU0b9Vgs/bQRiRfTqXiRPAMtXXzREh+h5RRAzXI=; b=b/pqM2/d/QPUx97TjMqJ0GEUbpRT5lHRm6tu0IZ8jDC75MU49D5GFL7ako72sF6FIM 4qzuTEcFmfBLQwR8RDF1uP9qJUgQsAkZrbQ1X0ALjWdLCwpL5SFBQ2dDP89iqOr+87jg hLhe+jQHydtw6092GTyNJ1ZYED7Eut2qIOKnuCYnrRg/0VMb2pU0JJIA4+LkhbI8FmMj LBbrP5IthTyR8fqtaslOyGJeX24jIdxfhKAbtVWIFPazMR+1svHA489IjuuX3FMNzIgc OTQXwsUA21jONJYuclUH90zFY/RGJoSxX2Vhc+j3twzcOI0zXucWzxTkH5+Y+mvDK6L5 1F/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782384315; x=1782989115; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=0a7qUU0b9Vgs/bQRiRfTqXiRPAMtXXzREh+h5RRAzXI=; b=g6lZOmEXL1IkpXOgdyTOaG8+aPKrEPGRPM8992Un33ajEuesxOTmnRHQNmano8ptwq KdmBTCrk/l3l/5iqe+LpmmDbeSdnIq1LuI19XXYbbIOGzzFbGfgmwmCfh00S2PDM1J8v D0Ljir0KDplp/KKumYBNeKK3bqsYpdFipH0MzBu6TwHWD1M1mxQRoWiAlkIGWEqlzsxp Eq+4zD96f6Pz+6YrVcuDTptBVLWdElO6HMUcc8tzFEdm3uHUkCpHL3ufTM3AGT+3Q7EH W7mecYVcTbc+VHL9hLqwqFNuT9dzvYQJBlxO/URBFmo9UjI/WLmFwXa+mR8IDp7HLIvt N6qA== X-Gm-Message-State: AOJu0YyKq3wxISILUXG2KKHmOgSV5PTZiPakxkzNGRa2+jm/CyjkGQnJ h+GC2Qnk8x7KongGtbPZ40lDCkr81D61/J7y8BHS+DJMkjYSSKYsQhv9 X-Gm-Gg: AfdE7cmwl2MjSP/+vKLn6dtj2FugQ7Q3lY2VXBfgFFQAAROkj6dPzroOuCd9P0cqTrh sKjXXD1OFeqPc1CKZ/3Uoi2DDg8y/7ezHw14K0t4Knw1Km7AnWx9GYGKGiJMdeA4Nq70+ToW9qi aUnpBocwTDX3h5gwh/gg4Kj3F3TWTOUinUFctGiYm/biJh7U0WeHAG6sMjrlbnkb9deECaCfWsk /P3zDqtK0BGG9QMQj4mEdEB0JCpSBIIq2wg+zEzh1eioWCFdxWL89vFZFLEhavIeAt5ZWFEuQXT vxbA5zFhOE5zF95abvvoJo7h/Qk4jZhiHjxCv8YOvpg2UPHlIGo1cHyIMPaVj08BweKPSJ70TQo Ftnzyzhi6VjLgBkmwQm6PtjIL79YU++f5TVjXkLFXyb9qeD1S3rKacRDRcpodOW2TFn+JY+C+b3 H2SMPYJhZh4NT/QE93+2K4NA== X-Received: by 2002:a05:6a21:b98:b0:3b4:895f:6abf with SMTP id adf61e73a8af0-3bd4b39b200mr1148613637.3.1782384314585; Thu, 25 Jun 2026 03:45:14 -0700 (PDT) Received: from localhost.localdomain ([189.1.242.96]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c92bc1e0d10sm1408853a12.21.2026.06.25.03.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 03:45:14 -0700 (PDT) From: Yiqi Sun To: catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, rmk+kernel@armlinux.org.uk, ruanjinjie@huawei.com, will@kernel.org, Yiqi Sun Subject: [PATCH v2] arm64: ptrace: use live x0 for seccomp and audit after ptrace Date: Thu, 25 Jun 2026 18:45:02 +0800 Message-Id: <2f435bab0d61d0bf8fbaa54203525aae8e8f5371.1782384161.git.sunyiqixm@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260529065444.1336608-1-sunyiqixm@gmail.com> References: <20260529065444.1336608-1-sunyiqixm@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On arm64, seccomp obtains syscall arguments via syscall_get_arguments(), where arg0 is currently read from regs->orig_x0. audit_syscall_entry() in syscall_trace_enter() also takes arg0 from regs->orig_x0. However, the syscall wrapper consumes live arguments from regs->regs[0..5]. A ptracer can modify x0 on syscall-enter stop before seccomp and audit run, but cannot update orig_x0 through the native syscall-stop interface. This can leave seccomp and audit checking stale arg0 while the syscall executes with updated live x0. Make both paths read arg0 from regs->regs[0], matching the actual dispatch arguments and keeping seccomp and audit aligned after ptrace updates. Fixes: f27bb139c387 ("arm64: Miscellaneous library functions") Signed-off-by: Yiqi Sun --- Changes in v2: - Also switch the arm64 audit entry path to use live x0 - Clarify the orig_x0 synchronization comment in syscall_set_arguments() --- arch/arm64/include/asm/syscall.h | 7 +++---- arch/arm64/kernel/ptrace.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h index 5e4c7fc44f73..0a44db425522 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -81,7 +81,7 @@ static inline void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, unsigned long *args) { - args[0] = regs->orig_x0; + args[0] = regs->regs[0]; args[1] = regs->regs[1]; args[2] = regs->regs[2]; args[3] = regs->regs[3]; @@ -101,9 +101,8 @@ static inline void syscall_set_arguments(struct task_struct *task, regs->regs[5] = args[5]; /* - * Also copy the first argument into orig_x0 - * so that syscall_get_arguments() would return it - * instead of the previous value. + * Keep orig_x0 in sync so syscall_rollback() and compat + * register views see the updated first argument. */ regs->orig_x0 = regs->regs[0]; } diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 4d08598e2891..35dd86f9e87a 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -2426,7 +2426,7 @@ int syscall_trace_enter(struct pt_regs *regs) if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) trace_sys_enter(regs, regs->syscallno); - audit_syscall_entry(regs->syscallno, regs->orig_x0, regs->regs[1], + audit_syscall_entry(regs->syscallno, regs->regs[0], regs->regs[1], regs->regs[2], regs->regs[3]); return regs->syscallno; -- 2.34.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D749335028D for ; Thu, 25 Jun 2026 11:11:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782385913; cv=none; b=OQMH5TGpEn/ZSue4tmYBWkZZp4OMExc1FwDI3EEh1GnxcdfpRL/CvMVLDDmV+LmTX46u3nGdv3H8pHNgc9v4vjQuvRLc+5IKXoRNkVjiACUllCzAz2oYUUVa3q9oTkHUI5kNKlePIpVzUPklKH66XKK/jIZ6zIpshtxb05EbKrQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782385913; c=relaxed/simple; bh=CUiVMSk6CXgG2Xclccs4QXcEUunw0Ana+R6dPAU+Oiw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ag/rOQgUqqFFNErtwaUMD2QycOcSwG5aWvde6s1vh+SYyTjv2PDOny4WCZaToHCOazf74ELWKy3THbJyAmuPPpXv6mCpdX1bkLlzSHKqtDzO2SgDYSqpoCquxDwGA8m+DDdsj8nPrZakHTnrTkLyu337uFPah61Ox7P+jlIxQoo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PDqhYvJs; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PDqhYvJs" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2c0c32d1350so1742315ad.3 for ; Thu, 25 Jun 2026 04:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782385911; x=1782990711; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=0a7qUU0b9Vgs/bQRiRfTqXiRPAMtXXzREh+h5RRAzXI=; b=PDqhYvJsWDBDOB81q9do8F6QlD1eET6brlO6ZJ3qD0xjnJUuvddP4PVflCiUtWaS+C c27uVBxBttB5tTa3iNYfBVaCQF3pxjd0EDOT10iOwfJ+EdjxLe7WtlgJ6FGTFpmz/tCs P5A64wNcpqtrm3nI+SvpGn05J3zoN4LUog4eXyfM41AT+0Abirl2xxzZzZpFTjppBcxh YOFOIJiWNBDjVIUt7FC4ToR7V2lQ/T/kQZEaAoPwbQUza1tfFiHotE0u+5M6XZEIEWh+ Czkt6nq6on83cFadyAleKibetfGF/TKsdRFpzlPiYJabSOZYkUJiqNGgN/P+JG72hxhK xd2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782385911; x=1782990711; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=0a7qUU0b9Vgs/bQRiRfTqXiRPAMtXXzREh+h5RRAzXI=; b=hs8UBdQxFKymVVRFQnWe5/zeZNniYrhgxjPmj4zv3MYl4BRoPq34ai//2KOj6ciwZM UxyxB3AW1BtkkihFls+YAymrdgfYbS96Z8GrmgqCHHHiuDFlw4RZCchCOiNgw4mptfU5 1PpwxW4FoZcXT3/h1e8TkKaJ7gCk3HdpoPHawbgFjdkzZZA/FcN4NjYmdFgn0v0rNpPJ /H5dqStnYgIpm/aSz/GDF3GKm3bz9W86/FxU+V3tSW7axRf/23pSWg+I/lin1p2508gJ m+OrCUfQMceNLYJAZ74QK10O4g/RWhbAxpdZpYQs5jrj1tfFc+u58b+oWxx6NWyfaO30 kQbQ== X-Forwarded-Encrypted: i=1; AHgh+RolNuA52xx5NWLag4b6hBI0VHnEcKoAgJwkcoGCD6f9wmkE/16Cl2IDeAAchFL1aImf8UhrHJAjTDWTmWM=@vger.kernel.org X-Gm-Message-State: AOJu0YwGoCctHG51YIa9+IqK2d54aZeTfvQ5owTUba03Absr9G9vk1SR V4DGDz2Hl39fu4LI0cnDhCvYQ5F8BNrqSRZ7akZ0vxikOBLWTb77xEks X-Gm-Gg: AfdE7cn3g4P/RS1nqXSiK8oidU8IvvlYPh1vqTzYmSZuhmFsU4ngiD78wBjg78dWqgn Vg7iVi+slhQqNMUXtlp2pzFS30ebDbWy6XZTGrR9WwQI/6ZGUmDoVU2FiXG+zTUZSfMBgYBbDP7 4LKFWhbGNw2lAtJCMWx1XHFKPORyDhbWT7lr7ne2ouIho1i1QH6UtNGMj/AUYN4eC+EVIWEotTy MU5vN33n/ZoT3CCIvKK+kJZfkKsyENh+pUGTWwPEzGb2Jg8gy2HMMK2GSgFIXhIC5GYnSeHx/RE D0XXv5g7kzil2sAHy+Qrnc+Z6a3plPNmn58b3jCEUE5EgUNT/qsEuU0zV0rkFkJVGq7vp1vOE99 G0dwIdXBRGg8PfItYcdp9qmtAoRh+FcfRqPA1vOXeVG4HFJVANHC8v6Lz71tirV+13b6QQvkjvV 4TWU7B95B5ru6oGjxRJCZZfg== X-Received: by 2002:a17:902:fc87:b0:2c0:c965:6656 with SMTP id d9443c01a7336-2c7fc729c16mr11686925ad.6.1782385910710; Thu, 25 Jun 2026 04:11:50 -0700 (PDT) Received: from localhost.localdomain ([189.1.242.96]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c7f5b04be8sm17995485ad.35.2026.06.25.04.11.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 04:11:50 -0700 (PDT) From: Yiqi Sun To: sunyiqixm@gmail.com Cc: catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, rmk+kernel@armlinux.org.uk, ruanjinjie@huawei.com, will@kernel.org Subject: [PATCH v2] arm64: ptrace: use live x0 for seccomp and audit after ptrace Date: Thu, 25 Jun 2026 19:11:39 +0800 Message-ID: <2f435bab0d61d0bf8fbaa54203525aae8e8f5371.1782384161.git.sunyiqixm@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260529065444.1336608-1-sunyiqixm@gmail.com> References: <20260529065444.1336608-1-sunyiqixm@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID: <20260625111139._kQMUzn9BetHrpnhD9eFG_6nkmrxZVftip_9Pa1f9Bs@z> On arm64, seccomp obtains syscall arguments via syscall_get_arguments(), where arg0 is currently read from regs->orig_x0. audit_syscall_entry() in syscall_trace_enter() also takes arg0 from regs->orig_x0. However, the syscall wrapper consumes live arguments from regs->regs[0..5]. A ptracer can modify x0 on syscall-enter stop before seccomp and audit run, but cannot update orig_x0 through the native syscall-stop interface. This can leave seccomp and audit checking stale arg0 while the syscall executes with updated live x0. Make both paths read arg0 from regs->regs[0], matching the actual dispatch arguments and keeping seccomp and audit aligned after ptrace updates. Fixes: f27bb139c387 ("arm64: Miscellaneous library functions") Signed-off-by: Yiqi Sun --- Changes in v2: - Also switch the arm64 audit entry path to use live x0 - Clarify the orig_x0 synchronization comment in syscall_set_arguments() --- arch/arm64/include/asm/syscall.h | 7 +++---- arch/arm64/kernel/ptrace.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h index 5e4c7fc44f73..0a44db425522 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -81,7 +81,7 @@ static inline void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, unsigned long *args) { - args[0] = regs->orig_x0; + args[0] = regs->regs[0]; args[1] = regs->regs[1]; args[2] = regs->regs[2]; args[3] = regs->regs[3]; @@ -101,9 +101,8 @@ static inline void syscall_set_arguments(struct task_struct *task, regs->regs[5] = args[5]; /* - * Also copy the first argument into orig_x0 - * so that syscall_get_arguments() would return it - * instead of the previous value. + * Keep orig_x0 in sync so syscall_rollback() and compat + * register views see the updated first argument. */ regs->orig_x0 = regs->regs[0]; } diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 4d08598e2891..35dd86f9e87a 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -2426,7 +2426,7 @@ int syscall_trace_enter(struct pt_regs *regs) if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) trace_sys_enter(regs, regs->syscallno); - audit_syscall_entry(regs->syscallno, regs->orig_x0, regs->regs[1], + audit_syscall_entry(regs->syscallno, regs->regs[0], regs->regs[1], regs->regs[2], regs->regs[3]); return regs->syscallno; -- 2.34.1