From patchwork Wed Jan 5 16:02:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 49601 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7C95A3858438 for ; Wed, 5 Jan 2022 16:03:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C95A3858438 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641398605; bh=u480/OJwej/j4wzpGe245oMyGEylv5FGLU/iblhaqfE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=OUrbIIMw1FikO432L51DWHnTHl8DLgoJuuARZWh7UQQnMGq7QBqrwKCi+TuEy8AZg tB+jY4Nx0KoW/PNAC9LvVebFXQomqNa+Yz2k+wpu92NpGm0aAAxsE/WXBYpegNzFNx NaciIn55sEBhY7XhGyJcjuMog4t8kBkLz3/JLT/w= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 45927385840E for ; Wed, 5 Jan 2022 16:03:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 45927385840E Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-543-t5IN1CUtOdmuiemFARbXUw-1; Wed, 05 Jan 2022 11:03:00 -0500 X-MC-Unique: t5IN1CUtOdmuiemFARbXUw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F109101796D; Wed, 5 Jan 2022 16:02:53 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E64F67EA39; Wed, 5 Jan 2022 16:02:49 +0000 (UTC) To: "Andy Lutomirski" Subject: [PATCH v3 1/3] x86: Implement arch_prctl(ARCH_VSYSCALL_CONTROL) to disable vsyscall X-From-Line: 3a1c8280967b491bf6917a18fbff6c9b52e8df24 Mon Sep 17 00:00:00 2001 Message-Id: <3a1c8280967b491bf6917a18fbff6c9b52e8df24.1641398395.git.fweimer@redhat.com> Date: Wed, 05 Jan 2022 17:02:48 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Cc: linux-arch@vger.kernel.org, libc-alpha@sourceware.org, Kees Cook , kernel-hardening@lists.openwall.com, Linux API , the arch/x86 maintainers , musl@lists.openwall.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrei Vagin , linux-x86_64@vger.kernel.org, Dave Hansen Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Distributions struggle with changing the default for vsyscall emulation because it is a clear break of userspace ABI, something that should not happen. The legacy vsyscall interface is supposed to be used by libcs only, not by applications. This commit adds a new arch_prctl request, ARCH_VSYSCALL_CONTROL, with one argument. If the argument is 0, executing vsyscalls will cause the process to terminate. Argument 1 turns vsyscall back on (this is mostly for a largely theoretical CRIU use case). Newer libcs can use a zero ARCH_VSYSCALL_CONTROL at startup to disable vsyscall for the process. Legacy libcs do not perform this call, so vsyscall remains enabled for them. This approach should achieves backwards compatibility (perfect compatibility if the assumption that only libcs use vsyscall is accurate), and it provides full hardening for new binaries. The chosen value of ARCH_VSYSCALL_CONTROL should avoid conflicts with other x86-64 arch_prctl requests. The fact that with vsyscall=emulate, reading the vsyscall region is still possible even after a zero ARCH_VSYSCALL_CONTROL is considered limitation in the current implementation and may change in a future kernel version. Future arch_prctls requests commonly used at process startup can imply ARCH_VSYSCALL_CONTROL with a zero argument, so that a separate system call for disabling vsyscall is avoided. Signed-off-by: Florian Weimer Acked-by: Andrei Vagin --- v3: Remove warning log message. Split out test. v2: ARCH_VSYSCALL_CONTROL instead of ARCH_VSYSCALL_LOCKOUT. New tests for the toggle behavior. Implement hiding [vsyscall] in /proc/PID/maps and test it. Various other test fixes cleanups (e.g., fixed missing second argument to gettimeofday). arch/x86/entry/vsyscall/vsyscall_64.c | 7 ++++++- arch/x86/include/asm/mmu.h | 6 ++++++ arch/x86/include/uapi/asm/prctl.h | 2 ++ arch/x86/kernel/process_64.c | 7 +++++++ 4 files changed, 21 insertions(+), 1 deletion(-) base-commit: c9e6606c7fe92b50a02ce51dda82586ebdf99b48 diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index fd2ee9408e91..6fc524b9f232 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -174,6 +174,9 @@ bool emulate_vsyscall(unsigned long error_code, tsk = current; + if (tsk->mm->context.vsyscall_disabled) + goto sigsegv; + /* * Check for access_ok violations and find the syscall nr. * @@ -316,8 +319,10 @@ static struct vm_area_struct gate_vma __ro_after_init = { struct vm_area_struct *get_gate_vma(struct mm_struct *mm) { + if (!mm || mm->context.vsyscall_disabled) + return NULL; #ifdef CONFIG_COMPAT - if (!mm || !(mm->context.flags & MM_CONTEXT_HAS_VSYSCALL)) + if (!(mm->context.flags & MM_CONTEXT_HAS_VSYSCALL)) return NULL; #endif if (vsyscall_mode == NONE) diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h index 5d7494631ea9..3934d6907910 100644 --- a/arch/x86/include/asm/mmu.h +++ b/arch/x86/include/asm/mmu.h @@ -41,6 +41,12 @@ typedef struct { #ifdef CONFIG_X86_64 unsigned short flags; #endif +#ifdef CONFIG_X86_VSYSCALL_EMULATION + /* + * Changed by arch_prctl(ARCH_VSYSCALL_CONTROL). + */ + bool vsyscall_disabled; +#endif struct mutex lock; void __user *vdso; /* vdso base address */ diff --git a/arch/x86/include/uapi/asm/prctl.h b/arch/x86/include/uapi/asm/prctl.h index 754a07856817..aad0bcfbf49f 100644 --- a/arch/x86/include/uapi/asm/prctl.h +++ b/arch/x86/include/uapi/asm/prctl.h @@ -18,4 +18,6 @@ #define ARCH_MAP_VDSO_32 0x2002 #define ARCH_MAP_VDSO_64 0x2003 +#define ARCH_VSYSCALL_CONTROL 0x5001 + #endif /* _ASM_X86_PRCTL_H */ diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 3402edec236c..834bad068211 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -816,6 +816,13 @@ long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2) ret = put_user(base, (unsigned long __user *)arg2); break; } +#ifdef CONFIG_X86_VSYSCALL_EMULATION + case ARCH_VSYSCALL_CONTROL: + if (unlikely(arg2 > 1)) + return -EINVAL; + current->mm->context.vsyscall_disabled = !arg2; + break; +#endif #ifdef CONFIG_CHECKPOINT_RESTORE # ifdef CONFIG_X86_X32_ABI