From: "tip-bot2 for Nikolay Borisov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Nikolay Borisov <nik.borisov@suse.com>,
Thomas Gleixner <tglx@linutronix.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/entry] x86/entry: Compile entry_SYSCALL32_ignore() unconditionally
Date: Thu, 14 Sep 2023 11:27:03 -0000 [thread overview]
Message-ID: <169469082375.27769.12443727333195550673.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230623111409.3047467-4-nik.borisov@suse.com>
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 370dcd58548a360bbf8a65b89b410d09f56bf0c6
Gitweb: https://git.kernel.org/tip/370dcd58548a360bbf8a65b89b410d09f56bf0c6
Author: Nikolay Borisov <nik.borisov@suse.com>
AuthorDate: Fri, 23 Jun 2023 14:14:06 +03:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 14 Sep 2023 13:19:53 +02:00
x86/entry: Compile entry_SYSCALL32_ignore() unconditionally
To limit the IA32 exposure on 64bit kernels while keeping the
flexibility for the user to enable it when required, the compile time
enable/disable via CONFIG_IA32_EMULATION is not good enough and will
be complemented with a kernel command line option.
Right now entry_SYSCALL32_ignore() is only compiled when
CONFIG_IA32_EMULATION=n, but boot-time enable- / disablement obviously
requires it to be unconditionally available.
Remove the #ifndef CONFIG_IA32_EMULATION guard.
Signed-off-by: Nikolay Borisov <nik.borisov@suse.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20230623111409.3047467-4-nik.borisov@suse.com
---
arch/x86/entry/entry_64.S | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 3be71ac..f71664d 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -1511,7 +1511,6 @@ nmi_restore:
iretq
SYM_CODE_END(asm_exc_nmi)
-#ifndef CONFIG_IA32_EMULATION
/*
* This handles SYSCALL from 32-bit code. There is no way to program
* MSRs to fully disable 32-bit SYSCALL.
@@ -1522,7 +1521,6 @@ SYM_CODE_START(entry_SYSCALL32_ignore)
mov $-ENOSYS, %eax
sysretl
SYM_CODE_END(entry_SYSCALL32_ignore)
-#endif
.pushsection .text, "ax"
__FUNC_ALIGN
next prev parent reply other threads:[~2023-09-14 11:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 11:14 [PATCH v4 0/6] Make IA32_EMULATION boot time overridable Nikolay Borisov
2023-06-23 11:14 ` [PATCH v4 1/6] x86: Introduce ia32_enabled() Nikolay Borisov
2023-06-30 11:18 ` Thomas Gleixner
2023-06-30 11:44 ` Thomas Gleixner
2023-09-14 11:27 ` [tip: x86/entry] " tip-bot2 for Nikolay Borisov
2023-06-23 11:14 ` [PATCH v4 2/6] x86/entry: Rename ignore_sysret() Nikolay Borisov
2023-09-14 11:27 ` [tip: x86/entry] " tip-bot2 for Nikolay Borisov
2023-06-23 11:14 ` [PATCH v4 3/6] x86/entry: Compile entry_SYSCALL32_ignore() unconditionally Nikolay Borisov
2023-09-14 11:27 ` tip-bot2 for Nikolay Borisov [this message]
2023-06-23 11:14 ` [PATCH v4 4/6] x86/elf: Make loading of 32bit processes depend on ia32_enabled() Nikolay Borisov
2023-09-14 11:27 ` [tip: x86/entry] " tip-bot2 for Nikolay Borisov
2023-06-23 11:14 ` [PATCH v4 5/6] x86/entry: Make IA32 syscalls' availability " Nikolay Borisov
2023-09-14 11:27 ` [tip: x86/entry] " tip-bot2 for Nikolay Borisov
2023-06-23 11:14 ` [PATCH v4 6/6] x86: Make IA32_EMULATION boot time configurable Nikolay Borisov
2023-09-14 11:27 ` [tip: x86/entry] " tip-bot2 for Nikolay Borisov
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=169469082375.27769.12443727333195550673.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=nik.borisov@suse.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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®