From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0A57623B633; Tue, 17 Jun 2025 15:33:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750174434; cv=none; b=Hy1zXlb2mPdpenrtDshEmX6ZnXhRYt0ZqyJd6YgqMj1TXNOabfeX7qMk4zWghvwdxJCtt2jJhEMO2MrYEQ9IupUoK/AoMdxkfb+i0PY/8cMUWx9T00zWGBS9mCLroSLpeY3812EE1lABvKKQZnG6mOO421ohdDAHVsdundi9db4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750174434; c=relaxed/simple; bh=gBStC8i7spQ9RNZt5szXonOXSJvsgg/EO+5h9gBl9Bo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mgIWconrw2HEAx2GnteWESlsw/ikzbjCr8XRFXrmvgn5O6rjUTc5KuXTMJvaunBg3HMdfgAVHx7rX996jCGnfkaoZXu+ga5qw1qIfXRB8lyPtmkSy+EqFPSGUJusn1Pinf7c1nj82x0A6BlmOY796AWbOJcoNykumECSVCU9N2o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=E8cI16L8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="E8cI16L8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19223C4CEE3; Tue, 17 Jun 2025 15:33:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750174433; bh=gBStC8i7spQ9RNZt5szXonOXSJvsgg/EO+5h9gBl9Bo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E8cI16L8hEItpbVphyvhf0TKG6ivBjiT/p82XK4ct2XU1rgRxPqSTsQjO/40K4dYg RYYBtJ8yMyciSP4bSUpGb8papIIM0Vu5aOifyw4X/Kn7uFgFPgRsvnfZVRy6HheWNy d4BLhd5dRiHBgl4Um/2fJuWI/mTH5XtUaqejuPwU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Neill Kapron , Kees Cook , Sasha Levin Subject: [PATCH 6.6 068/356] selftests/seccomp: fix syscall_restart test for arm compat Date: Tue, 17 Jun 2025 17:23:03 +0200 Message-ID: <20250617152340.965075968@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152338.212798615@linuxfoundation.org> References: <20250617152338.212798615@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Neill Kapron [ Upstream commit 797002deed03491215a352ace891749b39741b69 ] The inconsistencies in the systcall ABI between arm and arm-compat can can cause a failure in the syscall_restart test due to the logic attempting to work around the differences. The 'machine' field for an ARM64 device running in compat mode can report 'armv8l' or 'armv8b' which matches with the string 'arm' when only examining the first three characters of the string. This change adds additional validation to the workaround logic to make sure we only take the arm path when running natively, not in arm-compat. Fixes: 256d0afb11d6 ("selftests/seccomp: build and pass on arm64") Signed-off-by: Neill Kapron Link: https://lore.kernel.org/r/20250427094103.3488304-2-nkapron@google.com Signed-off-by: Kees Cook Signed-off-by: Sasha Levin --- tools/testing/selftests/seccomp/seccomp_bpf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index cacf6507f6905..15325ca35f1e2 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -3154,12 +3154,15 @@ TEST(syscall_restart) ret = get_syscall(_metadata, child_pid); #if defined(__arm__) /* - * FIXME: * - native ARM registers do NOT expose true syscall. * - compat ARM registers on ARM64 DO expose true syscall. + * - values of utsbuf.machine include 'armv8l' or 'armb8b' + * for ARM64 running in compat mode. */ ASSERT_EQ(0, uname(&utsbuf)); - if (strncmp(utsbuf.machine, "arm", 3) == 0) { + if ((strncmp(utsbuf.machine, "arm", 3) == 0) && + (strncmp(utsbuf.machine, "armv8l", 6) != 0) && + (strncmp(utsbuf.machine, "armv8b", 6) != 0)) { EXPECT_EQ(__NR_nanosleep, ret); } else #endif -- 2.39.5