Commit caf31008 authored by Philipp Stanner's avatar Philipp Stanner Committed by David S. Miller

drivers/net/ppp: use standard array-copy-function

In ppp_generic.c, memdup_user() is utilized to copy a userspace array.
This is done without an overflow-check, which is, however, not critical
because the multiplicands are an unsigned short and struct sock_filter,
which is currently of size 8.

Regardless, string.h now provides memdup_array_user(), a wrapper for
copying userspace arrays in a standardized manner, which has the
advantage of making it more obvious to the reader that an array is being
copied.
The wrapper additionally performs an obligatory overflow check, saving
the reader the effort of analyzing the potential for overflow, and
making the code a bit more robust in case of future changes to the
multiplicands len * size.

Replace memdup_user() with memdup_array_user().
Suggested-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarPhilipp Stanner <pstanner@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f968c564
...@@ -570,8 +570,8 @@ static struct bpf_prog *get_filter(struct sock_fprog *uprog) ...@@ -570,8 +570,8 @@ static struct bpf_prog *get_filter(struct sock_fprog *uprog)
/* uprog->len is unsigned short, so no overflow here */ /* uprog->len is unsigned short, so no overflow here */
fprog.len = uprog->len; fprog.len = uprog->len;
fprog.filter = memdup_user(uprog->filter, fprog.filter = memdup_array_user(uprog->filter,
uprog->len * sizeof(struct sock_filter)); uprog->len, sizeof(struct sock_filter));
if (IS_ERR(fprog.filter)) if (IS_ERR(fprog.filter))
return ERR_CAST(fprog.filter); return ERR_CAST(fprog.filter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment