mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 17:22:07 +00:00
8635e8df47
This reverts commit cead61a671.
It exported __stack_smash_handler and __guard, while they may not be
defined by anyone.
The code *declares* __stack_smash_handler and __guard. It does not
create weak symbols. If no external library is linked, they are left
undefined, but yet exported.
If a loadable module tries to access non-existing symbols, bad things
(a page fault, NULL pointer dereference, etc.) will happen. So, the
current code is wrong and dangerous.
If the code were written as follows, it would *define* them as weak
symbols so modules would be able to get access to them.
void (*__stack_smash_handler)(void *) __attribute__((weak));
EXPORT_SYMBOL(__stack_smash_handler);
long __guard __attribute__((weak));
EXPORT_SYMBOL(__guard);
In fact, modpost forbids exporting undefined symbols. It shows an error
message if it detects such a mistake.
ERROR: modpost: "..." [...] was exported without definition
Unfortunately, it is checked only when the code is built as modular.
The problem described above has been unnoticed for a long time because
arch/um/os-Linux/user_syms.c is always built-in.
With a planned change in Kbuild, exporting undefined symbols will always
result in a build error instead of a run-time error. It is a good thing,
but we need to fix the breakage in advance.
One fix is to define weak symbols as shown above. An alternative is to
export them conditionally as follows:
#ifdef CONFIG_STACKPROTECTOR
extern void __stack_smash_handler(void *);
EXPORT_SYMBOL(__stack_smash_handler);
external long __guard;
EXPORT_SYMBOL(__guard);
#endif
This is what other architectures do; EXPORT_SYMBOL(__stack_chk_guard)
is guarded by #ifdef CONFIG_STACKPROTECTOR.
However, adding the #ifdef guard is not sensible because UML cannot
enable the stack-protector in the first place! (Please note UML does
not select HAVE_STACKPROTECTOR in Kconfig.)
So, the code is already broken (and unused) in multiple ways.
Just remove.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
44 lines
1.2 KiB
C
44 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#define __NO_FORTIFY
|
|
#include <linux/types.h>
|
|
#include <linux/module.h>
|
|
|
|
/*
|
|
* This file exports some critical string functions and compiler
|
|
* built-in functions (where calls are emitted by the compiler
|
|
* itself that we cannot avoid even in kernel code) to modules.
|
|
*
|
|
* "_user.c" code that previously used exports here such as hostfs
|
|
* really should be considered part of the 'hypervisor' and define
|
|
* its own API boundary like hostfs does now; don't add exports to
|
|
* this file for such cases.
|
|
*/
|
|
|
|
/* If it's not defined, the export is included in lib/string.c.*/
|
|
#ifdef __HAVE_ARCH_STRSTR
|
|
#undef strstr
|
|
EXPORT_SYMBOL(strstr);
|
|
#endif
|
|
|
|
#ifndef __x86_64__
|
|
#undef memcpy
|
|
extern void *memcpy(void *, const void *, size_t);
|
|
EXPORT_SYMBOL(memcpy);
|
|
extern void *memmove(void *, const void *, size_t);
|
|
EXPORT_SYMBOL(memmove);
|
|
#undef memset
|
|
extern void *memset(void *, int, size_t);
|
|
EXPORT_SYMBOL(memset);
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA
|
|
/* needed for __access_ok() */
|
|
EXPORT_SYMBOL(vsyscall_ehdr);
|
|
EXPORT_SYMBOL(vsyscall_end);
|
|
#endif
|
|
|
|
#ifdef _FORTIFY_SOURCE
|
|
extern int __sprintf_chk(char *str, int flag, size_t len, const char *format);
|
|
EXPORT_SYMBOL(__sprintf_chk);
|
|
#endif
|