Skip to content

Commit 7575e5a

Browse files
Peter ZijlstraIngo Molnar
authored andcommitted
x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*()
Commit cb85597 ("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: cb85597 ("x86/putuser: Provide room for padding") Reported-by: David Kaplan <[email protected]> Reviewed-by: Andrew Cooper <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 25e73b7 commit 7575e5a

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

arch/x86/lib/putuser.S

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ SYM_FUNC_END(__put_user_1)
5656
EXPORT_SYMBOL(__put_user_1)
5757

5858
SYM_FUNC_START(__put_user_nocheck_1)
59-
ENDBR
6059
ASM_STAC
6160
2: movb %al,(%_ASM_CX)
6261
xor %ecx,%ecx
@@ -76,7 +75,6 @@ SYM_FUNC_END(__put_user_2)
7675
EXPORT_SYMBOL(__put_user_2)
7776

7877
SYM_FUNC_START(__put_user_nocheck_2)
79-
ENDBR
8078
ASM_STAC
8179
4: movw %ax,(%_ASM_CX)
8280
xor %ecx,%ecx
@@ -96,7 +94,6 @@ SYM_FUNC_END(__put_user_4)
9694
EXPORT_SYMBOL(__put_user_4)
9795

9896
SYM_FUNC_START(__put_user_nocheck_4)
99-
ENDBR
10097
ASM_STAC
10198
6: movl %eax,(%_ASM_CX)
10299
xor %ecx,%ecx
@@ -119,7 +116,6 @@ SYM_FUNC_END(__put_user_8)
119116
EXPORT_SYMBOL(__put_user_8)
120117

121118
SYM_FUNC_START(__put_user_nocheck_8)
122-
ENDBR
123119
ASM_STAC
124120
9: mov %_ASM_AX,(%_ASM_CX)
125121
#ifdef CONFIG_X86_32

0 commit comments

Comments
 (0)