Commit 7575e5a3 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*() 



Commit cb855971 ("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: cb855971 ("x86/putuser: Provide room for padding")
Reported-by: default avatarDavid Kaplan <David.Kaplan@amd.com>
Reviewed-by: default avatarAndrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230802110323.086971726@infradead.org
parent 25e73b7e

arch/x86/lib/putuser.S

+0 −4
Original line number Diff line number Diff line
@@ -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