This is a note to let you know that I've just added the patch titled
bpf: Fix error usage of map_fd and fdget() in generic_map_update_batch()
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bpf-fix-error-usage-of-map_fd-and-fdget-in-generic_map_update_batch.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fda7a38714f40b635f5502ec4855602c6b33dad2 Mon Sep 17 00:00:00 2001
From: Xu Kuohai <xukuohai@xxxxxxxxxx>
Date: Tue, 19 Oct 2021 03:29:34 +0000
Subject: bpf: Fix error usage of map_fd and fdget() in generic_map_update_batch()
From: Xu Kuohai <xukuohai@xxxxxxxxxx>
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: aa2e93b8e58e ("bpf: Add generic support for update and delete batch ops")
Signed-off-by: Xu Kuohai <xukuohai@xxxxxxxxxx>
Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxx>
Link: https://lore.kernel.org/bpf/20211019032934.1210517-1-xukuohai@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
kernel/bpf/syscall.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1309,12 +1309,11 @@ int generic_map_update_batch(struct bpf_
void __user *values = u64_to_user_ptr(attr->batch.values);
void __user *keys = u64_to_user_ptr(attr->batch.keys);
u32 value_size, cp, max_count;
- int ufd = attr->map_fd;
+ int ufd = attr->batch.map_fd;
void *key, *value;
struct fd f;
int err = 0;
- f = fdget(ufd);
if (attr->batch.elem_flags & ~BPF_F_LOCK)
return -EINVAL;
@@ -1339,6 +1338,7 @@ int generic_map_update_batch(struct bpf_
return -ENOMEM;
}
+ f = fdget(ufd); /* bpf_map_do_batch() guarantees ufd is valid */
for (cp = 0; cp < max_count; cp++) {
err = -EFAULT;
if (copy_from_user(key, keys + cp * map->key_size,
@@ -1358,6 +1358,7 @@ int generic_map_update_batch(struct bpf_
kfree(value);
kfree(key);
+ fdput(f);
return err;
}
Patches currently in stable-queue which might be from xukuohai@xxxxxxxxxx are
queue-5.10/bpf-fix-error-usage-of-map_fd-and-fdget-in-generic_map_update_batch.patch
