bpf: Don't echo user-supplied map info fields back to userspace
Daniel Borkmann
maintainerPATCH v2 1/1 bpf: Don't echo user-supplied map info fields back to userspace
Commit ea2e6467ac36 ("bpf: Return hashes of maps in BPF_OBJ_GET_INFO_BY_FD") started copying struct bpf_map_info in from userspace in order to read the new hash and hash_size input fields. Before that, the kernel ignored the contents of the user buffer and returned a zeroed structure with only the output fields filled in.
Some output fields are only set for certain maps: btf_id, btf_key_type_id and btf_value_type_id when the map has BTF (and btf_vmlinux_id for struct_ops maps, ifindex, netns_dev and netns_ino when the map is offloaded). For all other maps, these fields now return whatever userspace passed in before.
This breaks userspace which reuses one bpf_map_info for several queries. Restore the original behavior by zeroing the structure and copying in only hash and hash_size from userspace before the output fields are filled in.
---
v1 -> v2:
- simplify, only do memset once (Alexei)
kernel/bpf/syscall.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
kernel/bpf/syscall.c +5 -1
@@ -5448,7 +5448,11 @@ static int bpf_map_get_info_by_fd(struct file *file, info_len =min_t (u32,sizeof (info), info_len);memset (&info,0 ,sizeof (info)); -if (copy_from_user (&info, uinfo, info_len)) + if (info_len >= offsetofend(struct bpf_map_info, hash) && +get_user (info.hash, &uinfo->hash)) +return -EFAULT ; + if (info_len >= offsetofend(struct bpf_map_info, hash_size) && +get_user (info.hash_size, &uinfo->hash_size))return -EFAULT ; info.type = map->map_type;
Signature · 1 line
2.43.0
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 6 lines · On Fri, 16 Oct 2026 21:16:35 +0200 you wrote:
Commit
ea2e6467ac36("bpf: Return hashes of maps inBPF_OBJ_GET_INFO_BY_FD") started copying structbpf_map_infoin from userspace in order to read the new hash andhash_sizeinput fields. Before that, the kernel ignored the contents of the user buffer and returned a zeroed structure with only the output fields filled in.
Quoted 7 lines
Some output fields are only set for certain maps:
btf_id,btf_key_type_idandbtf_value_type_idwhen the map has BTF (andbtf_vmlinux_idforstruct_opsmaps, ifindex,netns_devandnetns_inowhen the map is offloaded). For all other maps, these fields now return whatever userspace passed in before.[...]
Here is the summary with links:
- [bpf-next,v2] bpf: Don't echo user-supplied map info fields back to userspace
https://git.kernel.org/bpf/bpf-next/c/458575e1f2dd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html