diff options
| author | Kees Cook <keescook@chromium.org> | 2016-09-07 09:39:32 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2016-09-07 11:33:26 -0700 |
| commit | a85d6b8242dc78ef3f4542a0f979aebcbe77fc4e (patch) | |
| tree | 71e873932fdbbeaa732c42bd059d4c85c7366af5 /include/linux/thread_info.h | |
| parent | ab29b33a84f6910ebf01a32f69a370886a4283dd (diff) | |
| download | linux-a85d6b8242dc78ef3f4542a0f979aebcbe77fc4e.tar.gz | |
usercopy: force check_object_size() inline
Just for good measure, make sure that check_object_size() is always
inlined too, as already done for copy_*_user() and __copy_*_user().
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'include/linux/thread_info.h')
| -rw-r--r-- | include/linux/thread_info.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 10c9e601398b..2b5b10eed74f 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -118,8 +118,8 @@ static inline int arch_within_stack_frames(const void * const stack, extern void __check_object_size(const void *ptr, unsigned long n, bool to_user); -static inline void check_object_size(const void *ptr, unsigned long n, - bool to_user) +static __always_inline void check_object_size(const void *ptr, unsigned long n, + bool to_user) { if (!__builtin_constant_p(n)) __check_object_size(ptr, n, to_user); |