Skip to content

Commit 8eed4e0

Browse files
qzhuo2bp3tk0v
authored andcommitted
x86/lib: Revert to _ASM_EXTABLE_UA() for {get,put}_user() fixups
During memory error injection test on kernels >= v6.4, the kernel panics like below. However, this issue couldn't be reproduced on kernels <= v6.3. mce: [Hardware Error]: CPU 296: Machine Check Exception: f Bank 1: bd80000000100134 mce: [Hardware Error]: RIP 10:<ffffffff821b9776> {__get_user_nocheck_4+0x6/0x20} mce: [Hardware Error]: TSC 411a93533ed ADDR 346a8730040 MISC 86 mce: [Hardware Error]: PROCESSOR 0:a06d0 TIME 1706000767 SOCKET 1 APIC 211 microcode 80001490 mce: [Hardware Error]: Run the above through 'mcelog --ascii' mce: [Hardware Error]: Machine check: Data load in unrecoverable area of kernel Kernel panic - not syncing: Fatal local machine check The MCA code can recover from an in-kernel #MC if the fixup type is EX_TYPE_UACCESS, explicitly indicating that the kernel is attempting to access userspace memory. However, if the fixup type is EX_TYPE_DEFAULT the only thing that is raised for an in-kernel #MC is a panic. ex_handler_uaccess() would warn if users gave a non-canonical addresses (with bit 63 clear) to {get, put}_user(), which was unexpected. Therefore, commit b19b74b ("x86/mm: Rework address range check in get_user() and put_user()") replaced _ASM_EXTABLE_UA() with _ASM_EXTABLE() for {get, put}_user() fixups. However, the new fixup type EX_TYPE_DEFAULT results in a panic. Commit 6014bc2 ("x86-64: make access_ok() independent of LAM") added the check gp_fault_address_ok() right before the WARN_ONCE() in ex_handler_uaccess() to not warn about non-canonical user addresses due to LAM. With that in place, revert back to _ASM_EXTABLE_UA() for {get,put}_user() exception fixups in order to be able to handle in-kernel MCEs correctly again. [ bp: Massage commit message. ] Fixes: b19b74b ("x86/mm: Rework address range check in get_user() and put_user()") Signed-off-by: Qiuxu Zhuo <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Kirill A. Shutemov <[email protected]> Cc: <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 41bccc9 commit 8eed4e0

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

arch/x86/lib/getuser.S

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,23 +163,23 @@ SYM_CODE_END(__get_user_8_handle_exception)
163163
#endif
164164

165165
/* get_user */
166-
_ASM_EXTABLE(1b, __get_user_handle_exception)
167-
_ASM_EXTABLE(2b, __get_user_handle_exception)
168-
_ASM_EXTABLE(3b, __get_user_handle_exception)
166+
_ASM_EXTABLE_UA(1b, __get_user_handle_exception)
167+
_ASM_EXTABLE_UA(2b, __get_user_handle_exception)
168+
_ASM_EXTABLE_UA(3b, __get_user_handle_exception)
169169
#ifdef CONFIG_X86_64
170-
_ASM_EXTABLE(4b, __get_user_handle_exception)
170+
_ASM_EXTABLE_UA(4b, __get_user_handle_exception)
171171
#else
172-
_ASM_EXTABLE(4b, __get_user_8_handle_exception)
173-
_ASM_EXTABLE(5b, __get_user_8_handle_exception)
172+
_ASM_EXTABLE_UA(4b, __get_user_8_handle_exception)
173+
_ASM_EXTABLE_UA(5b, __get_user_8_handle_exception)
174174
#endif
175175

176176
/* __get_user */
177-
_ASM_EXTABLE(6b, __get_user_handle_exception)
178-
_ASM_EXTABLE(7b, __get_user_handle_exception)
179-
_ASM_EXTABLE(8b, __get_user_handle_exception)
177+
_ASM_EXTABLE_UA(6b, __get_user_handle_exception)
178+
_ASM_EXTABLE_UA(7b, __get_user_handle_exception)
179+
_ASM_EXTABLE_UA(8b, __get_user_handle_exception)
180180
#ifdef CONFIG_X86_64
181-
_ASM_EXTABLE(9b, __get_user_handle_exception)
181+
_ASM_EXTABLE_UA(9b, __get_user_handle_exception)
182182
#else
183-
_ASM_EXTABLE(9b, __get_user_8_handle_exception)
184-
_ASM_EXTABLE(10b, __get_user_8_handle_exception)
183+
_ASM_EXTABLE_UA(9b, __get_user_8_handle_exception)
184+
_ASM_EXTABLE_UA(10b, __get_user_8_handle_exception)
185185
#endif

arch/x86/lib/putuser.S

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,15 @@ SYM_CODE_START_LOCAL(__put_user_handle_exception)
133133
RET
134134
SYM_CODE_END(__put_user_handle_exception)
135135

136-
_ASM_EXTABLE(1b, __put_user_handle_exception)
137-
_ASM_EXTABLE(2b, __put_user_handle_exception)
138-
_ASM_EXTABLE(3b, __put_user_handle_exception)
139-
_ASM_EXTABLE(4b, __put_user_handle_exception)
140-
_ASM_EXTABLE(5b, __put_user_handle_exception)
141-
_ASM_EXTABLE(6b, __put_user_handle_exception)
142-
_ASM_EXTABLE(7b, __put_user_handle_exception)
143-
_ASM_EXTABLE(9b, __put_user_handle_exception)
136+
_ASM_EXTABLE_UA(1b, __put_user_handle_exception)
137+
_ASM_EXTABLE_UA(2b, __put_user_handle_exception)
138+
_ASM_EXTABLE_UA(3b, __put_user_handle_exception)
139+
_ASM_EXTABLE_UA(4b, __put_user_handle_exception)
140+
_ASM_EXTABLE_UA(5b, __put_user_handle_exception)
141+
_ASM_EXTABLE_UA(6b, __put_user_handle_exception)
142+
_ASM_EXTABLE_UA(7b, __put_user_handle_exception)
143+
_ASM_EXTABLE_UA(9b, __put_user_handle_exception)
144144
#ifdef CONFIG_X86_32
145-
_ASM_EXTABLE(8b, __put_user_handle_exception)
146-
_ASM_EXTABLE(10b, __put_user_handle_exception)
145+
_ASM_EXTABLE_UA(8b, __put_user_handle_exception)
146+
_ASM_EXTABLE_UA(10b, __put_user_handle_exception)
147147
#endif

0 commit comments

Comments
 (0)