xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: Fix error usage of map_fd and fdget() in generic_map_update_batch()

Browse Source 
commit fda7a38714f40b635f5502ec4855602c6b33dad2 upstream.

1. The ufd in generic_map_update_batch() should be read from batch.map_fd;
2. A call to fdget() should be followed by a symmetric call to fdput().

Fixes: aa2e93b8e5 ("bpf: Add generic support for update and delete batch ops")
Signed-off-by: Xu Kuohai <xukuohai@huawei.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211019032934.1210517-1-xukuohai@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Xu Kuohai
2021-10-19 03:29:34 +00:00
committed by Greg Kroah-Hartman
parent dd2260ec64
commit ee4908f909
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/bpf/syscall.c
View File

@@ -1309,12 +1309,11 @@ int generic_map_update_batch(struct bpf_map *map,
void __user *values = u64_to_user_ptr(attr->batch.values); void __user *values = u64_to_user_ptr(attr->batch.values);
void __user *keys = u64_to_user_ptr(attr->batch.keys); void __user *keys = u64_to_user_ptr(attr->batch.keys);
u32 value_size, cp, max_count; u32 value_size, cp, max_count;
int ufd = attr->map_fd; int ufd = attr->batch.map_fd;
void *key, *value; void *key, *value;
struct fd f; struct fd f;
int err = 0; int err = 0;
f = fdget(ufd);
if (attr->batch.elem_flags & ~BPF_F_LOCK) if (attr->batch.elem_flags & ~BPF_F_LOCK)
return -EINVAL; return -EINVAL;
@@ -1339,6 +1338,7 @@ int generic_map_update_batch(struct bpf_map *map,
return -ENOMEM; return -ENOMEM;
} }
f = fdget(ufd); /* bpf_map_do_batch() guarantees ufd is valid */
for (cp = 0; cp < max_count; cp++) { for (cp = 0; cp < max_count; cp++) {
err = -EFAULT; err = -EFAULT;
if (copy_from_user(key, keys + cp * map->key_size, if (copy_from_user(key, keys + cp * map->key_size,
@@ -1358,6 +1358,7 @@ int generic_map_update_batch(struct bpf_map *map,
kfree(value); kfree(value);
kfree(key); kfree(key);
fdput(f);
return err; return err;
} }