diff options
| author | Kees Cook <keescook@chromium.org> | 2021-04-14 15:45:39 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2021-06-19 00:25:30 -0700 |
| commit | 823c220f26ba7c2fe612e2ecb3e012e807baeab4 (patch) | |
| tree | 1446fd517733ca97710fa5b966a55fa69c47b1ac | |
| parent | 245fccabb5777708f67afa04fc6b99a3f794986f (diff) | |
| download | linux-823c220f26ba7c2fe612e2ecb3e012e807baeab4.tar.gz | |
fortify: Move remaining fortify helpers into fortify-string.h
This moves a few remaining fortify-specific helpers into fortify-string.h,
which were accidentally left behind. (And removes unused helpers.)
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Francis Laniel <laniel_francis@privacyrequired.com>
Cc: Daniel Axtens <dja@axtens.net>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Fixes: a28a6e860c6c ("string.h: move fortified functions definitions in a dedicated header.")
Signed-off-by: Kees Cook <keescook@chromium.org>
| -rw-r--r-- | include/linux/fortify-string.h | 7 | ||||
| -rw-r--r-- | include/linux/string.h | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h index c1be37437e778..7e67d02764dbb 100644 --- a/include/linux/fortify-string.h +++ b/include/linux/fortify-string.h @@ -2,6 +2,13 @@ #ifndef _LINUX_FORTIFY_STRING_H_ #define _LINUX_FORTIFY_STRING_H_ +#define __FORTIFY_INLINE extern __always_inline __attribute__((gnu_inline)) +#define __RENAME(x) __asm__(#x) + +void fortify_panic(const char *name) __noreturn __cold; +void __read_overflow(void) __compiletime_error("detected read beyond size of object (1st parameter)"); +void __read_overflow2(void) __compiletime_error("detected read beyond size of object (2nd parameter)"); +void __write_overflow(void) __compiletime_error("detected write beyond size of object (1st parameter)"); #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) extern void *__underlying_memchr(const void *p, int c, __kernel_size_t size) __RENAME(memchr); diff --git a/include/linux/string.h b/include/linux/string.h index b48d2d28e0b11..9473f81b9db24 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -249,15 +249,6 @@ static inline const char *kbasename(const char *path) return tail ? tail + 1 : path; } -#define __FORTIFY_INLINE extern __always_inline __attribute__((gnu_inline)) -#define __RENAME(x) __asm__(#x) - -void fortify_panic(const char *name) __noreturn __cold; -void __read_overflow(void) __compiletime_error("detected read beyond size of object passed as 1st parameter"); -void __read_overflow2(void) __compiletime_error("detected read beyond size of object passed as 2nd parameter"); -void __read_overflow3(void) __compiletime_error("detected read beyond size of object passed as 3rd parameter"); -void __write_overflow(void) __compiletime_error("detected write beyond size of object passed as 1st parameter"); - #if !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE) #include <linux/fortify-string.h> #endif |