|
@@ -65,9 +65,9 @@ static const struct bpf_map_ops * const bpf_map_types[] = {
|
|
|
* copy_from_user() call. However, this is not a concern since this function is
|
|
|
* meant to be a future-proofing of bits.
|
|
|
*/
|
|
|
-static int check_uarg_tail_zero(void __user *uaddr,
|
|
|
- size_t expected_size,
|
|
|
- size_t actual_size)
|
|
|
+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;
|
|
@@ -1899,7 +1899,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog,
|
|
|
u32 ulen;
|
|
|
int err;
|
|
|
|
|
|
- err = check_uarg_tail_zero(uinfo, sizeof(info), info_len);
|
|
|
+ err = bpf_check_uarg_tail_zero(uinfo, sizeof(info), info_len);
|
|
|
if (err)
|
|
|
return err;
|
|
|
info_len = min_t(u32, sizeof(info), info_len);
|
|
@@ -1998,7 +1998,7 @@ static int bpf_map_get_info_by_fd(struct bpf_map *map,
|
|
|
u32 info_len = attr->info.info_len;
|
|
|
int err;
|
|
|
|
|
|
- err = check_uarg_tail_zero(uinfo, sizeof(info), info_len);
|
|
|
+ err = bpf_check_uarg_tail_zero(uinfo, sizeof(info), info_len);
|
|
|
if (err)
|
|
|
return err;
|
|
|
info_len = min_t(u32, sizeof(info), info_len);
|
|
@@ -2038,7 +2038,7 @@ static int bpf_btf_get_info_by_fd(struct btf *btf,
|
|
|
u32 info_len = attr->info.info_len;
|
|
|
int err;
|
|
|
|
|
|
- err = check_uarg_tail_zero(uinfo, sizeof(*uinfo), info_len);
|
|
|
+ err = bpf_check_uarg_tail_zero(uinfo, sizeof(*uinfo), info_len);
|
|
|
if (err)
|
|
|
return err;
|
|
|
|
|
@@ -2110,7 +2110,7 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
|
|
|
if (sysctl_unprivileged_bpf_disabled && !capable(CAP_SYS_ADMIN))
|
|
|
return -EPERM;
|
|
|
|
|
|
- err = check_uarg_tail_zero(uattr, sizeof(attr), size);
|
|
|
+ err = bpf_check_uarg_tail_zero(uattr, sizeof(attr), size);
|
|
|
if (err)
|
|
|
return err;
|
|
|
size = min_t(u32, size, sizeof(attr));
|