summaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-02-07 00:42:05 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-07 03:32:48 +0100
commitc4fed5a91fadc8a277b1eda474317b501651dd3e (patch)
tree6194bd7d003a2527f675dee2ab3fbb03332a8e19 /fs/ceph
parentpipe: reject F_SETPIPE_SZ with size over UINT_MAX (diff)
downloadlinux-c4fed5a91fadc8a277b1eda474317b501651dd3e.tar.xz
linux-c4fed5a91fadc8a277b1eda474317b501651dd3e.zip
pipe: simplify round_pipe_size()
round_pipe_size() calculates the number of pages the requested size corresponds to, then rounds the page count up to the next power of 2. However, it also rounds everything < PAGE_SIZE up to PAGE_SIZE. Therefore, there's no need to actually translate the size into a page count; we just need to round the size up to the next power of 2. We do need to verify the size isn't greater than (1 << 31), since on 32-bit systems roundup_pow_of_two() would be undefined in that case. But that can just be combined with the UINT_MAX check which we need anyway now. Finally, update pipe_set_size() to not redundantly check the return value of round_pipe_size() for the "invalid size" case twice. Link: http://lkml.kernel.org/r/20180111052902.14409-7-ebiggers3@gmail.com Signed-off-by: Eric Biggers <ebiggers@google.com> Acked-by: Kees Cook <keescook@chromium.org> Acked-by: Joe Lawrence <joe.lawrence@redhat.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: "Luis R . Rodriguez" <mcgrof@kernel.org> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Mikulas Patocka <mpatocka@redhat.com> Cc: Willy Tarreau <w@1wt.eu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ceph')
0 files changed, 0 insertions, 0 deletions