diff options
author | Kees Cook <keescook@chromium.org> | 2016-08-31 16:04:21 -0700 |
---|---|---|
committer | Sami Tolvanen <samitolvanen@google.com> | 2016-09-08 18:10:20 +0000 |
commit | 1fd70f71e8f428f0c191a6b86e72e700dbe34bed (patch) | |
tree | 6944861cfd0510830f5cfdc34258a961d9d502a2 /include | |
parent | 1a4f17ec07cc4a938b6695e92e4f2b2ec7c3d527 (diff) |
BACKPORT: usercopy: fold builtin_const check into inline function
Instead of having each caller of check_object_size() need to remember to
check for a const size parameter, move the check into check_object_size()
itself. This actually matches the original implementation in PaX, though
this commit cleans up the now-redundant builtin_const() calls in the
various architectures.
Signed-off-by: Kees Cook <keescook@chromium.org>
Change-Id: I348809399c10ffa051251866063be674d064b9ff
(cherry picked from 81409e9e28058811c9ea865345e1753f8f677e44)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/thread_info.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 0ae29ff9ccfd..eded095fe81e 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -161,7 +161,8 @@ extern void __check_object_size(const void *ptr, unsigned long n, static inline void check_object_size(const void *ptr, unsigned long n, bool to_user) { - __check_object_size(ptr, n, to_user); + if (!__builtin_constant_p(n)) + __check_object_size(ptr, n, to_user); } #else static inline void check_object_size(const void *ptr, unsigned long n, |