From nobody Sat May 10 05:10:46 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619815115; cv=none; d=zohomail.com; s=zohoarc; b=O7PJtmD2FcQQ0bjWEQQiV2MjKLFVTNgkQTvdwVkdKVB23TUSAEqt4ec+VzowoJ6pX4OTKGjoL+25ZgVR1GYValLxSNdlFvM5qtkEjQPbPrz7bTUhzlPfzvkkGax/xlhEuunCz+Tw7XXU2j/6SFycsvr5n3KFGJvmB+cz7IhU3dE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619815115; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Subject:To; bh=W8HlNSywnIkavL/zIcpgi9C3SQjg+1ILx19xA07tItE=; b=Hwp1BSNCZDJ+aFBVDQaOFcaLc6XLXXXCc7TVgU4fVNAdcyg6m8MBASSl9B3nQyyGDQjVpQ9QuurK2Uw+C2P0QpfLqs90ewWi2k0+sJKl1rFTLDNSx0QTQfteHE7drB93z8HOCZRErx5edQoQ5H+a1zANu+HQb7Bl0pVFLUCqx1k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1619815115557306.842902194315; Fri, 30 Apr 2021 13:38:35 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236102AbhD3UjW (ORCPT ); Fri, 30 Apr 2021 16:39:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236054AbhD3UjI (ORCPT ); Fri, 30 Apr 2021 16:39:08 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68008C06138B for ; Fri, 30 Apr 2021 13:38:19 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id h4so62900830wrt.12 for ; Fri, 30 Apr 2021 13:38:19 -0700 (PDT) Received: from amanieu-desktop.home ([2a00:23c6:f081:f801:93ef:94e:9f8:1f0]) by smtp.gmail.com with ESMTPSA id r5sm4384239wmh.23.2021.04.30.13.38.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 13:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W8HlNSywnIkavL/zIcpgi9C3SQjg+1ILx19xA07tItE=; b=Tnwq+5UxdRYkBVHdXf/QrQ9s4F6nnVtKUKD2NYkttreUp9iUecEx1AKt/DzsxjodxD X0lMEOhpA5f9h1KEPQ0NaUxS3WDq6Yb58ovj5y0OKHlqmw7xYsXu95tD66XtCVPpxhL1 zp2/hBkjR0a1b7KlJKVvnN9vd5t8T24iNbF/cg7CQGMQsxAZCxs26nkElLFObpMcridR YJXB7X2j91NwAdja7B0bIQTjCesZaSS3wQNP7tYu7iSzcYAuDNjMEFUdiDx0Yx76kwdK H6xh3IbtNg4prfokDfTgXw/h3I/ufVI2kaQm9kZbi6arBc/dj8gkNH+uOCo/5+rQBsV/ Gf2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W8HlNSywnIkavL/zIcpgi9C3SQjg+1ILx19xA07tItE=; b=e5N9X1pkPRI689vhNcCxmu0xNK09jZcDcggM04Llhicn7ieXLUc5Dq7lNdNP1yNVIo 0GyKD4daNb01rETt1ICu1SxwFHjBJZUT+WcuImHEVnq+634ax8GS+Bo/NtxjyWMXsblG u7+N0i0m1HxNx2nuIsqMdvdrgqFKjMrkpyrHk0ECaD7o3Hy441nviLMIvHGP0a/Oxh7p TCt28OtZO22yoH5spxj4ZYcubAgr8O3iJ0KEhRC9AbwxVjZLK6PjRTMS12ObmQU6qKNM Da9YyWO1d3LPS02+0rp45DoN/nQJX0KyingrxXifFalEYAWF/r9lQjqgzXQXVm7gz09P KcYw== X-Gm-Message-State: AOAM532FQPc3rDs2Fo/0yL6zMp8FZTPU8OyfqZfRkOK/Jrg+kHdvFg48 0CNF7nV2pVH8wYGivWh/rWg= X-Google-Smtp-Source: ABdhPJwkHUBHZjxsMejlk4q2z3yroJTh21vFO8NECQS2otHtdv4mPUmcoMfoHgrOhcxtXwFgXF+8jQ== X-Received: by 2002:adf:ffcc:: with SMTP id x12mr9722457wrs.162.1619815098163; Fri, 30 Apr 2021 13:38:18 -0700 (PDT) From: Amanieu d'Antras Cc: Amanieu d'Antras , Ryan Houdek , Catalin Marinas , Will Deacon , Mark Rutland , Steven Price , Arnd Bergmann , David Laight , Mark Brown , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 8/8] arm64: Allow 64-bit tasks to invoke compat syscalls Date: Fri, 30 Apr 2021 21:37:57 +0100 Message-Id: <20210430203757.47653-7-amanieu@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210430202810.44092-1-amanieu@gmail.com> References: <20210430202810.44092-1-amanieu@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Setting bit 31 in x8 when performing a syscall will do the following: - The remainder of x8 is treated as a compat syscall number and is used to index the compat syscall table. - in_compat_syscall will return true for the duration of the syscall. - VM allocations performed by the syscall will be located in the lower 4G of the address space. - Interrupted syscalls are properly restarted as compat syscalls. - Seccomp will treats the syscall as having AUDIT_ARCH_ARM instead of AUDIT_ARCH_AARCH64. This affects the arch value seen by seccomp filters and reported by SIGSYS. - PTRACE_GET_SYSCALL_INFO also treats the syscall as having AUDIT_ARCH_ARM. Recent versions of strace will correctly report the system call name and parameters when an AArch64 task mixes 32-bit and 64-bit syscalls. Previously, setting bit 31 of the syscall number would always cause the sygscall to return ENOSYS. This allows user programs to reliably detect kernel support for compat syscall by trying a simple syscall such as getpid. The AArch32-private compat syscalls (__ARM_NR_compat_*) are not exposed through this interface. These syscalls do not make sense in the context of an AArch64 task. Signed-off-by: Amanieu d'Antras Co-developed-by: Ryan Houdek Signed-off-by: Ryan Houdek --- arch/arm64/include/uapi/asm/unistd.h | 2 ++ arch/arm64/kernel/signal.c | 5 +++++ arch/arm64/kernel/syscall.c | 21 ++++++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi= /asm/unistd.h index f83a70e07df8..5574bc6ab0a3 100644 --- a/arch/arm64/include/uapi/asm/unistd.h +++ b/arch/arm64/include/uapi/asm/unistd.h @@ -15,6 +15,8 @@ * along with this program. If not, see . */ =20 +#define __ARM64_COMPAT_SYSCALL_BIT 0x80000000 + #define __ARCH_WANT_RENAMEAT #define __ARCH_WANT_NEW_STAT #define __ARCH_WANT_SET_GET_RLIMIT diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 6237486ff6bb..463c8a82050e 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -795,6 +795,11 @@ static void setup_restart_syscall(struct pt_regs *regs) { if (is_compat_task()) compat_setup_restart_syscall(regs); +#ifdef COMPAT + else if (in_compat_syscall()) + regs->regs[8] =3D __ARM64_COMPAT_SYSCALL_BIT | + __NR_compat_restart_syscall; +#endif else regs->regs[8] =3D __NR_restart_syscall; } diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c index e0e9d54de0a2..83747cf4b5b7 100644 --- a/arch/arm64/kernel/syscall.c +++ b/arch/arm64/kernel/syscall.c @@ -118,6 +118,11 @@ static void el0_svc_common(struct pt_regs *regs, int s= cno, int sc_nr, * user-issued syscall(-1). However, requesting a skip and not * setting the return value is unlikely to do anything sensible * anyway. + * + * This edge case goes away with CONFIG_COMPAT since a + * user-issued syscall(-1) is interpreted as a + * compat_syscall(0x7fffffff) which still ends up returning + * -ENOSYS in x0. */ if (scno =3D=3D NO_SYSCALL) regs->regs[0] =3D -ENOSYS; @@ -165,7 +170,21 @@ static inline void sve_user_discard(void) void do_el0_svc(struct pt_regs *regs) { sve_user_discard(); - el0_svc_common(regs, regs->regs[8], __NR_syscalls, sys_call_table); + +#ifdef CONFIG_COMPAT + /* + * Setting bit 31 of x8 allows a 64-bit processe to perform compat + * syscalls. + */ + if (regs->regs[8] & __ARM64_COMPAT_SYSCALL_BIT) { + current_thread_info()->use_compat_syscall =3D true; + el0_svc_common(regs, + regs->regs[8] & ~__ARM64_COMPAT_SYSCALL_BIT, + __NR_compat_syscalls, compat_sys_call_table); + current_thread_info()->use_compat_syscall =3D false; + } else +#endif + el0_svc_common(regs, regs->regs[8], __NR_syscalls, sys_call_table); } =20 #ifdef CONFIG_COMPAT --=20 2.31.1