x86/boot/compressed/64: fix warning for 32-bit trampoline copy
PATCH v2 1/1 x86/boot/compressed/64: fix warning for 32-bit trampoline copy
gcc-8 warns that we copy TRAMPOLINE_32BIT_CODE_SIZE bytes from the pointer to the function into actual trampoline, when that pointer is only 8 bytes:
In file included from arch/x86/boot/compressed/pgtable_64.c:3:arch/x86/boot/compressed/pgtable_64.c: In function 'paging_prepare':arch/x86/boot/compressed/../string.h:18:23: error: '__builtin_memcpy' reading 96 bytes from a region of size 8 [-Werror=stringop-overflow=]
#define memcpy(d,s,l) __builtin_memcpy(d,s,l)
^~~~~~~~~~~~~~~~~~~~~~~arch/x86/boot/compressed/pgtable_64.c:62:2: note: in expansion of macro 'memcpy'
memcpy(trampoline + TRAMPOLINE_32BIT_CODE_OFFSET / sizeof(unsigned long), ^~~~~~
It turns out that the declaration is incorrect here: trampoline_32bit_src is defined as a function in arch/x86/boot/compressed/head_64.S, not a pointer to a function. Fixing the prototype to match addresses the warning.
---
v2: fix prototype rather than (incorrectly) change the user
--- arch/x86/boot/compressed/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/boot/compressed/pgtable.h +1 -1
@@ -12,7 +12,7 @@#ifndef __ASSEMBLER__ -extern void (*trampoline_32bit_src)(void *return_ptr); +extern void trampoline_32bit_src (void *return_ptr);#endif /* __ASSEMBLER__ */ #endif /* BOOT_COMPRESSED_PAGETABLE_H */
Signature · 1 line
2.9.0
tip-bot for Arnd Bergmann
merge bot[tip:x86/mm] x86/boot/compressed/64: Fix warning for 32-bit trampoline memcpy()
x86/boot/compressed/64: Fix warning for 32-bit trampoline memcpy()
Commit-ID: fba407e1710ae4c558e1e2b55b5a55b2c07a596d Gitweb: https://git.kernel.org/tip/fba407e1710ae4c558e1e2b55b5a55b2c07a596d Author: Arnd Bergmann <[email protected]> AuthorDate: Thu, 22 Feb 2018 12:28:05 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 23 Feb 2018 08:29:54 +0100
x86/boot/compressed/64: Fix warning for 32-bit trampoline memcpy()
GCC-8 warns that we copy TRAMPOLINE_32BIT_CODE_SIZE bytes from the pointer to the function into actual trampoline, when that pointer is only 8 bytes:
In file included from arch/x86/boot/compressed/pgtable_64.c:3:
arch/x86/boot/compressed/pgtable_64.c: In function 'paging_prepare':
arch/x86/boot/compressed/../string.h:18:23: error: '__builtin_memcpy' reading 96 bytes from a region of size 8 [-Werror=stringop-overflow=]
#define memcpy(d,s,l) __builtin_memcpy(d,s,l)
^~~~~~~~~~~~~~~~~~~~~~~ arch/x86/boot/compressed/pgtable_64.c:62:2: note: in expansion of macro 'memcpy'
memcpy(trampoline + TRAMPOLINE_32BIT_CODE_OFFSET / sizeof(unsigned long), ^~~~~~
It turns out that the declaration is incorrect here: trampoline_32bit_src is defined as a function in arch/x86/boot/compressed/head_64.S, not a pointer to a function. Fixing the prototype to match addresses the warning.
--- arch/x86/boot/compressed/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/boot/compressed/pgtable.h +1 -1
@@ -12,7 +12,7 @@#ifndef __ASSEMBLER__ -extern void (*trampoline_32bit_src)(void *return_ptr); +extern void trampoline_32bit_src (void *return_ptr);#endif /* __ASSEMBLER__ */ #endif /* BOOT_COMPRESSED_PAGETABLE_H */