Skip to content

Commit 4ce9731

Browse files
nickdesaulniersKAGA-KOKO
authored andcommitted
x86/purgatory: Do not use __builtin_memcpy and __builtin_memset
Implementing memcpy and memset in terms of __builtin_memcpy and __builtin_memset is problematic. GCC at -O2 will replace calls to the builtins with calls to memcpy and memset (but will generate an inline implementation at -Os). Clang will replace the builtins with these calls regardless of optimization level. $ llvm-objdump -dr arch/x86/purgatory/string.o | tail 0000000000000339 memcpy: 339: 48 b8 00 00 00 00 00 00 00 00 movabsq $0, %rax 000000000000033b: R_X86_64_64 memcpy 343: ff e0 jmpq *%rax 0000000000000345 memset: 345: 48 b8 00 00 00 00 00 00 00 00 movabsq $0, %rax 0000000000000347: R_X86_64_64 memset 34f: ff e0 Such code results in infinite recursion at runtime. This is observed when doing kexec. Instead, reuse an implementation from arch/x86/boot/compressed/string.c. This requires to implement a stub function for warn(). Also, Clang may lower memcmp's that compare against 0 to bcmp's, so add a small definition, too. See also: commit 5f074f3 ("lib/string.c: implement a basic bcmp") Fixes: 8fc5b4d ("purgatory: core purgatory functionality") Reported-by: Vaibhav Rustagi <[email protected]> Debugged-by: Vaibhav Rustagi <[email protected]> Debugged-by: Manoj Gupta <[email protected]> Suggested-by: Alistair Delva <[email protected]> Signed-off-by: Nick Desaulniers <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Tested-by: Vaibhav Rustagi <[email protected]> Cc: [email protected] Link: https://bugs.chromium.org/p/chromium/issues/detail?id=984056 Link: https://lkml.kernel.org/r/[email protected]
1 parent 7468a4e commit 4ce9731

File tree

4 files changed

+17
-23
lines changed

4 files changed

+17
-23
lines changed

arch/x86/boot/string.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ int memcmp(const void *s1, const void *s2, size_t len)
3737
return diff;
3838
}
3939

40+
/*
41+
* Clang may lower `memcmp == 0` to `bcmp == 0`.
42+
*/
43+
int bcmp(const void *s1, const void *s2, size_t len)
44+
{
45+
return memcmp(s1, s2, len);
46+
}
47+
4048
int strcmp(const char *str1, const char *str2)
4149
{
4250
const unsigned char *s1 = (const unsigned char *)str1;

arch/x86/purgatory/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ purgatory-y := purgatory.o stack.o setup-x86_$(BITS).o sha256.o entry64.o string
66
targets += $(purgatory-y)
77
PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
88

9+
$(obj)/string.o: $(srctree)/arch/x86/boot/compressed/string.c FORCE
10+
$(call if_changed_rule,cc_o_c)
11+
912
$(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE
1013
$(call if_changed_rule,cc_o_c)
1114

arch/x86/purgatory/purgatory.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,9 @@ void purgatory(void)
6868
}
6969
copy_backup_region();
7070
}
71+
72+
/*
73+
* Defined in order to reuse memcpy() and memset() from
74+
* arch/x86/boot/compressed/string.c
75+
*/
76+
void warn(const char *msg) {}

arch/x86/purgatory/string.c

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)