Skip to content

Commit b3fd7fd

Browse files
keesSasha Levin
authored and
Sasha Levin
committed
ubsan: Avoid i386 UBSAN handler crashes with Clang
[ Upstream commit 2e431b2 ] When generating Runtime Calls, Clang doesn't respect the -mregparm=3 option used on i386. Hopefully this will be fixed correctly in Clang 19: llvm/llvm-project#89707 but we need to fix this for earlier Clang versions today. Force the calling convention to use non-register arguments. Reported-by: Erhard Furtner <[email protected]> Closes: KSPP/linux#350 Link: https://lore.kernel.org/r/[email protected] Acked-by: Nathan Chancellor <[email protected]> Acked-by: Justin Stitt <[email protected]> Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent c19a8db commit b3fd7fd

File tree

1 file changed

+27
-14
lines changed

1 file changed

+27
-14
lines changed

lib/ubsan.h

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,32 @@ typedef s64 s_max;
124124
typedef u64 u_max;
125125
#endif
126126

127-
void __ubsan_handle_add_overflow(void *data, void *lhs, void *rhs);
128-
void __ubsan_handle_sub_overflow(void *data, void *lhs, void *rhs);
129-
void __ubsan_handle_mul_overflow(void *data, void *lhs, void *rhs);
130-
void __ubsan_handle_negate_overflow(void *_data, void *old_val);
131-
void __ubsan_handle_divrem_overflow(void *_data, void *lhs, void *rhs);
132-
void __ubsan_handle_type_mismatch(struct type_mismatch_data *data, void *ptr);
133-
void __ubsan_handle_type_mismatch_v1(void *_data, void *ptr);
134-
void __ubsan_handle_out_of_bounds(void *_data, void *index);
135-
void __ubsan_handle_shift_out_of_bounds(void *_data, void *lhs, void *rhs);
136-
void __ubsan_handle_builtin_unreachable(void *_data);
137-
void __ubsan_handle_load_invalid_value(void *_data, void *val);
138-
void __ubsan_handle_alignment_assumption(void *_data, unsigned long ptr,
139-
unsigned long align,
140-
unsigned long offset);
127+
/*
128+
* When generating Runtime Calls, Clang doesn't respect the -mregparm=3
129+
* option used on i386: https://github.com/llvm/llvm-project/issues/89670
130+
* Fix this for earlier Clang versions by forcing the calling convention
131+
* to use non-register arguments.
132+
*/
133+
#if defined(CONFIG_X86_32) && \
134+
defined(CONFIG_CC_IS_CLANG) && CONFIG_CLANG_VERSION < 190000
135+
# define ubsan_linkage asmlinkage
136+
#else
137+
# define ubsan_linkage
138+
#endif
139+
140+
void ubsan_linkage __ubsan_handle_add_overflow(void *data, void *lhs, void *rhs);
141+
void ubsan_linkage __ubsan_handle_sub_overflow(void *data, void *lhs, void *rhs);
142+
void ubsan_linkage __ubsan_handle_mul_overflow(void *data, void *lhs, void *rhs);
143+
void ubsan_linkage __ubsan_handle_negate_overflow(void *_data, void *old_val);
144+
void ubsan_linkage __ubsan_handle_divrem_overflow(void *_data, void *lhs, void *rhs);
145+
void ubsan_linkage __ubsan_handle_type_mismatch(struct type_mismatch_data *data, void *ptr);
146+
void ubsan_linkage __ubsan_handle_type_mismatch_v1(void *_data, void *ptr);
147+
void ubsan_linkage __ubsan_handle_out_of_bounds(void *_data, void *index);
148+
void ubsan_linkage __ubsan_handle_shift_out_of_bounds(void *_data, void *lhs, void *rhs);
149+
void ubsan_linkage __ubsan_handle_builtin_unreachable(void *_data);
150+
void ubsan_linkage __ubsan_handle_load_invalid_value(void *_data, void *val);
151+
void ubsan_linkage __ubsan_handle_alignment_assumption(void *_data, unsigned long ptr,
152+
unsigned long align,
153+
unsigned long offset);
141154

142155
#endif

0 commit comments

Comments
 (0)