diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-14 09:45:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-06 15:56:03 +0200 |
| commit | 57a269a1b12a3a6fe51f62e1be5e74494bad1d92 (patch) | |
| tree | 99ca19fb4845ef8978ea9c1f6c12ea74e883d75b /mm | |
| parent | da5b8b9319f044c2ca24f6602c54033931e0c1cc (diff) | |
| download | linux-stable-57a269a1b12a3a6fe51f62e1be5e74494bad1d92.tar.gz linux-stable-57a269a1b12a3a6fe51f62e1be5e74494bad1d92.tar.bz2 linux-stable-57a269a1b12a3a6fe51f62e1be5e74494bad1d92.zip | |
mm: don't allow oversized kvmalloc() calls
commit 7661809d493b426e979f39ab512e3adf41fbcc69 upstream.
'kvmalloc()' is a convenience function for people who want to do a
kmalloc() but fall back on vmalloc() if there aren't enough physically
contiguous pages, or if the allocation is larger than what kmalloc()
supports.
However, let's make sure it doesn't get _too_ easy to do crazy things
with it. In particular, don't allow big allocations that could be due
to integer overflow or underflow. So make sure the allocation size fits
in an 'int', to protect against trivial integer conversion issues.
Acked-by: Willy Tarreau <w@1wt.eu>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/util.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/util.c b/mm/util.c index d5be67771850..90792e4eaa25 100644 --- a/mm/util.c +++ b/mm/util.c @@ -581,6 +581,10 @@ void *kvmalloc_node(size_t size, gfp_t flags, int node) if (ret || size <= PAGE_SIZE) return ret; + /* Don't even allow crazy sizes */ + if (WARN_ON_ONCE(size > INT_MAX)) + return NULL; + return __vmalloc_node(size, 1, flags, node, __builtin_return_address(0)); } |