Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-block.git] / kernel / bpf / syscall.c

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index e9a3ebc00e08fb8cf7b262268658a171c62ee9bf..8da159936bab17e4b322561457ca03f8608dffd3 100644 (file)
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -25,7 +25,7 @@
 #include <linux/nospec.h>
 #include <linux/audit.h>
 #include <uapi/linux/btf.h>
-#include <asm/pgtable.h>
+#include <linux/pgtable.h>
 #include <linux/bpf_lsm.h>
 #include <linux/poll.h>
 #include <linux/bpf-netns.h>
@@ -74,32 +74,19 @@ int bpf_check_uarg_tail_zero(void __user *uaddr,
                             size_t expected_size,
                             size_t actual_size)
 {
-       unsigned char __user *addr;
-       unsigned char __user *end;
-       unsigned char val;
-       int err;
+       unsigned char __user *addr = uaddr + expected_size;
+       int res;
 
        if (unlikely(actual_size > PAGE_SIZE))  /* silly large */
                return -E2BIG;
 
-       if (unlikely(!access_ok(uaddr, actual_size)))
-               return -EFAULT;
-
        if (actual_size <= expected_size)
                return 0;
 
-       addr = uaddr + expected_size;
-       end  = uaddr + actual_size;
-
-       for (; addr < end; addr++) {
-               err = get_user(val, addr);
-               if (err)
-                       return err;
-               if (val)
-                       return -E2BIG;
-       }
-
-       return 0;
+       res = check_zeroed_user(addr, actual_size - expected_size);
+       if (res < 0)
+               return res;
+       return res ? 0 : -E2BIG;
 }
 
 const struct bpf_map_ops bpf_map_offload_ops = {