mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Andy Lutomirski <luto@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Ard Biesheuvel <ardb@kernel.org>,
	"Paul E. McKenney" <paulmck@kernel.org>,
	Josh Poimboeuf <jpoimboe@kernel.org>,
	Xiongwei Song <xiongwei.song@windriver.com>,
	Xin Li <xin3.li@intel.com>,
	"Mike Rapoport (IBM)" <rppt@kernel.org>,
	Brijesh Singh <brijesh.singh@amd.com>,
	Michael Roth <michael.roth@amd.com>,
	Tony Luck <tony.luck@intel.com>,
	"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
	Alexey Kardashevskiy <aik@amd.com>
Cc: Jonathan Corbet <corbet@lwn.net>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Sohil Mehta <sohil.mehta@intel.com>,
	Ingo Molnar <mingo@kernel.org>,
	Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
	Daniel Sneddon <daniel.sneddon@linux.intel.com>,
	Kai Huang <kai.huang@intel.com>,
	Sandipan Das <sandipan.das@amd.com>,
	Breno Leitao <leitao@debian.org>,
	Rick Edgecombe <rick.p.edgecombe@intel.com>,
	Alexei Starovoitov <ast@kernel.org>, Hou Tao <houtao1@huawei.com>,
	Juergen Gross <jgross@suse.com>,
	Vegard Nossum <vegard.nossum@oracle.com>,
	Kees Cook <kees@kernel.org>, Eric Biggers <ebiggers@google.com>,
	Jason Gunthorpe <jgg@ziepe.ca>,
	"Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Luis Chamberlain <mcgrof@kernel.org>,
	Yuntao Wang <ytcoode@gmail.com>,
	Rasmus Villemoes <linux@rasmusvillemoes.dk>,
	Christophe Leroy <christophe.leroy@csgroup.eu>,
	Tejun Heo <tj@kernel.org>, Changbin Du <changbin.du@huawei.com>,
	Huang Shijie <shijie@os.amperecomputing.com>,
	Geert Uytterhoeven <geert+renesas@glider.be>,
	Namhyung Kim <namhyung@kernel.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-efi@vger.kernel.org
Subject: [PATCH v5 10/16] x86/vsyscall: Disable LASS if vsyscall mode is set to EMULATE
Date: Mon, 28 Oct 2024 18:07:58 +0200	[thread overview]
Message-ID: <20241028160917.1380714-11-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <20241028160917.1380714-1-alexander.shishkin@linux.intel.com>

From: Sohil Mehta <sohil.mehta@intel.com>

The EMULATE mode of vsyscall maps the vsyscall page into user address
space which can be read directly by the user application. This mode has
been deprecated recently and can only be enabled from a special command
line parameter vsyscall=emulate. See commit bf00745e7791 ("x86/vsyscall:
Remove CONFIG_LEGACY_VSYSCALL_EMULATE")

Fixing the LASS violations during the EMULATE mode would need complex
instruction decoding since the resulting #GP fault does not include any
useful error information and the vsyscall address is not readily
available in the RIP.

At this point, no one is expected to be using the insecure and
deprecated EMULATE mode. The rare usages that need support probably
don't care much about security anyway. Disable LASS when EMULATE mode is
requested during command line parsing to avoid breaking user software.
LASS will be supported if vsyscall mode is set to XONLY or NONE.

Signed-off-by: Sohil Mehta <sohil.mehta@intel.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
 arch/x86/entry/vsyscall/vsyscall_64.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c
index 97608883b4b4..7c845c1db3b4 100644
--- a/arch/x86/entry/vsyscall/vsyscall_64.c
+++ b/arch/x86/entry/vsyscall/vsyscall_64.c
@@ -36,6 +36,7 @@
 #include <asm/vsyscall.h>
 #include <asm/unistd.h>
 #include <asm/fixmap.h>
+#include <asm/tlbflush.h>
 #include <asm/traps.h>
 #include <asm/paravirt.h>
 
@@ -63,6 +64,13 @@ static int __init vsyscall_setup(char *str)
 		else
 			return -EINVAL;
 
+		if (cpu_feature_enabled(X86_FEATURE_LASS) &&
+		    vsyscall_mode == EMULATE) {
+			cr4_clear_bits(X86_CR4_LASS);
+			setup_clear_cpu_cap(X86_FEATURE_LASS);
+			pr_warn_once("x86/cpu: Disabling LASS support due to vsyscall=emulate\n");
+		}
+
 		return 0;
 	}
 
-- 
2.45.2


  parent reply	other threads:[~2024-10-28 16:11 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-28 16:07 [PATCH v5 00/16] Enable Linear Address Space Separation support Alexander Shishkin
2024-10-28 16:07 ` [PATCH v5 01/16] x86/cpu: Enumerate the LASS feature bits Alexander Shishkin
2024-10-29 14:55   ` Kirill A. Shutemov
2024-10-29 21:46     ` Sohil Mehta
2024-10-28 16:07 ` [PATCH v5 02/16] x86/asm: Introduce inline memcpy and memset Alexander Shishkin
2024-10-28 16:07 ` [PATCH v5 03/16] x86/alternatives: Disable LASS when patching kernel alternatives Alexander Shishkin
2024-10-28 17:49   ` Dave Hansen
2024-10-29 11:36     ` Peter Zijlstra
2024-10-29 18:48       ` Peter Zijlstra
2024-10-30  7:40         ` Alexander Shishkin
2024-10-28 16:07 ` [PATCH v5 04/16] init/main.c: Move EFI runtime service initialization to x86/cpu Alexander Shishkin
2024-10-29 22:35   ` Sohil Mehta
2024-10-30  7:36   ` Ard Biesheuvel
2024-10-28 16:07 ` [PATCH v5 05/16] x86/cpu: Defer CR pinning setup until after EFI initialization Alexander Shishkin
2024-10-29 22:10   ` Sohil Mehta
2024-10-29 22:26     ` Luck, Tony
2024-10-29 22:52       ` Dave Hansen
2024-10-29 22:59         ` Luck, Tony
2024-10-29 23:02           ` H. Peter Anvin
2024-10-29 23:03           ` Dave Hansen
2024-10-29 23:05             ` H. Peter Anvin
2024-10-29 23:18               ` Luck, Tony
2024-10-29 23:41                 ` H. Peter Anvin
2024-10-30 11:43                 ` Kirill A. Shutemov
2024-10-28 16:07 ` [PATCH v5 06/16] efi: Disable LASS around set_virtual_address_map call Alexander Shishkin
2024-10-29 15:00   ` Kirill A. Shutemov
2024-10-28 16:07 ` [PATCH v5 07/16] x86/vsyscall: Reorganize the #PF emulation code Alexander Shishkin
2024-10-28 16:07 ` [PATCH v5 08/16] x86/traps: Consolidate user fixups in exc_general_protection() Alexander Shishkin
2024-10-28 16:07 ` [PATCH v5 09/16] x86/vsyscall: Add vsyscall emulation for #GP Alexander Shishkin
2024-10-28 16:07 ` Alexander Shishkin [this message]
2024-10-28 16:07 ` [PATCH v5 11/16] x86/vsyscall: Document the fact that vsyscall=emulate disables LASS Alexander Shishkin
2024-10-29 23:41   ` Sohil Mehta
2024-10-28 16:08 ` [PATCH v5 12/16] x86/cpu: Set LASS CR4 bit as pinning sensitive Alexander Shishkin
2024-10-28 16:08 ` [PATCH v5 13/16] x86/traps: Communicate a LASS violation in #GP message Alexander Shishkin
2024-10-28 16:08 ` [PATCH v5 14/16] x86/cpu: Make LAM depend on LASS Alexander Shishkin
2024-10-31  0:06   ` Sohil Mehta
2024-10-28 16:08 ` [PATCH v5 15/16] x86/cpu: Enable LASS during CPU initialization Alexander Shishkin
2024-10-28 16:08 ` [PATCH v5 16/16] Revert "x86/lam: Disable ADDRESS_MASKING in most cases" Alexander Shishkin
2024-10-28 20:41   ` Kirill A. Shutemov
2024-10-28 22:00     ` Alexander Shishkin
2024-10-29 17:14 ` [PATCH v5 00/16] Enable Linear Address Space Separation support Matthew Wilcox
2024-10-30  7:16   ` Alexander Shishkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241028160917.1380714-11-alexander.shishkin@linux.intel.com \
    --to=alexander.shishkin@linux.intel.com \
    --cc=acme@redhat.com \
    --cc=aik@amd.com \
    --cc=akpm@linux-foundation.org \
    --cc=ardb@kernel.org \
    --cc=ast@kernel.org \
    --cc=bp@alien8.de \
    --cc=brijesh.singh@amd.com \
    --cc=changbin.du@huawei.com \
    --cc=christophe.leroy@csgroup.eu \
    --cc=corbet@lwn.net \
    --cc=daniel.sneddon@linux.intel.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=ebiggers@google.com \
    --cc=geert+renesas@glider.be \
    --cc=houtao1@huawei.com \
    --cc=hpa@zytor.com \
    --cc=jgg@ziepe.ca \
    --cc=jgross@suse.com \
    --cc=jpoimboe@kernel.org \
    --cc=kai.huang@intel.com \
    --cc=kees@kernel.org \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=leitao@debian.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@rasmusvillemoes.dk \
    --cc=luto@kernel.org \
    --cc=mcgrof@kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=michael.roth@amd.com \
    --cc=mingo@kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=paulmck@kernel.org \
    --cc=pawan.kumar.gupta@linux.intel.com \
    --cc=peterz@infradead.org \
    --cc=rick.p.edgecombe@intel.com \
    --cc=rppt@kernel.org \
    --cc=sandipan.das@amd.com \
    --cc=shijie@os.amperecomputing.com \
    --cc=sohil.mehta@intel.com \
    --cc=tglx@linutronix.de \
    --cc=tj@kernel.org \
    --cc=tony.luck@intel.com \
    --cc=vegard.nossum@oracle.com \
    --cc=x86@kernel.org \
    --cc=xin3.li@intel.com \
    --cc=xiongwei.song@windriver.com \
    --cc=ytcoode@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®