diff --git a/include/linux/ucopysize.h b/include/linux/ucopysize.h index 41c2d9720466..b3eacb4869a8 100644 --- a/include/linux/ucopysize.h +++ b/include/linux/ucopysize.h @@ -42,7 +42,7 @@ static inline void copy_overflow(int size, unsigned long count) } static __always_inline __must_check bool -check_copy_size(const void *addr, size_t bytes, bool is_source) +check_copy_size_nosec(const void *addr, size_t bytes, bool is_source) { int sz = __builtin_object_size(addr, 0); if (unlikely(sz >= 0 && sz < bytes)) { @@ -56,6 +56,14 @@ check_copy_size(const void *addr, size_t bytes, bool is_source) } if (WARN_ON_ONCE(bytes > INT_MAX)) return false; + return true; +} + +static __always_inline __must_check bool +check_copy_size(const void *addr, size_t bytes, bool is_source) +{ + if (!check_copy_size_nosec(addr, bytes, is_source)) + return false; check_object_size(addr, bytes, is_source); return true; } diff --git a/include/linux/uio.h b/include/linux/uio.h index a9bc5b3067e3..f860529abfbe 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -216,8 +216,13 @@ size_t copy_page_to_iter_nofault(struct page *page, unsigned offset, static __always_inline __must_check size_t copy_to_iter(const void *addr, size_t bytes, struct iov_iter *i) { - if (check_copy_size(addr, bytes, true)) - return _copy_to_iter(addr, bytes, i); + if (user_backed_iter(i)) { + if (check_copy_size(addr, bytes, true)) + return _copy_to_iter(addr, bytes, i); + } else { + if (check_copy_size_nosec(addr, bytes, true)) + return _copy_to_iter(addr, bytes, i); + } return 0; }