From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: David Kaplan <David.Kaplan@amd.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Andrew Cooper <andrew.cooper3@citrix.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*()
Date: Tue, 12 Sep 2023 11:08:31 -0000 [thread overview]
Message-ID: <169451691192.27769.584862233902801314.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230802110323.086971726@infradead.org>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 1666863f28d7c490fa62ed5d1dfb1ba31453dc98
Gitweb: https://git.kernel.org/tip/1666863f28d7c490fa62ed5d1dfb1ba31453dc98
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Wed, 02 Aug 2023 12:55:47 +02:00
Committer: root <root@noisy.programming.kicks-ass.net>
CommitterDate: Tue, 12 Sep 2023 12:40:28 +02:00
x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*()
Commit cb855971d717 ("x86/putuser: Provide room for padding") changed
__put_user_nocheck_*() into proper functions but failed to note that
SYM_FUNC_START() already provides ENDBR, rendering the explicit ENDBR
superfluous.
Fixes: cb855971d717 ("x86/putuser: Provide room for padding")
Reported-by: David Kaplan <David.Kaplan@amd.com>
Signed-off-by: "Peter Zijlstra (Intel)" <peterz@infradead.org>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230802110323.086971726@infradead.org
---
arch/x86/lib/putuser.S | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
index 1451e0c..235bbda 100644
--- a/arch/x86/lib/putuser.S
+++ b/arch/x86/lib/putuser.S
@@ -56,7 +56,6 @@ SYM_FUNC_END(__put_user_1)
EXPORT_SYMBOL(__put_user_1)
SYM_FUNC_START(__put_user_nocheck_1)
- ENDBR
ASM_STAC
2: movb %al,(%_ASM_CX)
xor %ecx,%ecx
@@ -76,7 +75,6 @@ SYM_FUNC_END(__put_user_2)
EXPORT_SYMBOL(__put_user_2)
SYM_FUNC_START(__put_user_nocheck_2)
- ENDBR
ASM_STAC
4: movw %ax,(%_ASM_CX)
xor %ecx,%ecx
@@ -96,7 +94,6 @@ SYM_FUNC_END(__put_user_4)
EXPORT_SYMBOL(__put_user_4)
SYM_FUNC_START(__put_user_nocheck_4)
- ENDBR
ASM_STAC
6: movl %eax,(%_ASM_CX)
xor %ecx,%ecx
@@ -119,7 +116,6 @@ SYM_FUNC_END(__put_user_8)
EXPORT_SYMBOL(__put_user_8)
SYM_FUNC_START(__put_user_nocheck_8)
- ENDBR
ASM_STAC
9: mov %_ASM_AX,(%_ASM_CX)
#ifdef CONFIG_X86_32
next prev parent reply other threads:[~2023-09-12 11:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-02 10:55 [PATCH 0/2] x86/ibt: Fix some spurious ENDBR instances Peter Zijlstra
2023-08-02 10:55 ` [PATCH 1/2] x86/ibt: Suppress spurious ENDBR Peter Zijlstra
2023-09-12 11:08 ` [tip: x86/urgent] " tip-bot2 for Peter Zijlstra
2023-09-12 15:54 ` tip-bot2 for Peter Zijlstra
2023-08-02 10:55 ` [PATCH 2/2] x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*() Peter Zijlstra
2023-08-02 20:33 ` Peter Zijlstra
2023-09-12 11:08 ` tip-bot2 for Peter Zijlstra [this message]
2023-09-12 15:54 ` [tip: x86/urgent] " tip-bot2 for Peter Zijlstra
2023-08-02 11:25 ` [PATCH 0/2] x86/ibt: Fix some spurious ENDBR instances andrew.cooper3
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=169451691192.27769.584862233902801314.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=David.Kaplan@amd.com \
--cc=andrew.cooper3@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--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®