samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: Return prog btf_id without capable check

Browse Source 
[ Upstream commit 07651ccda9ff10a8ca427670cdd06ce2c8e4269c ]

Return prog's btf_id from bpf_prog_get_info_by_fd regardless of capable
check. This patch enables scenario, when freplace program, running
from user namespace, requires to query target prog's btf.

Signed-off-by: Mykyta Yatsenko <yatsenko@meta.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/bpf/20250317174039.161275-3-mykyta.yatsenko5@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Mykyta Yatsenko
2025-03-17 17:40:37 +00:00
committed by Greg Kroah-Hartman
parent 743bb75325
commit 5741b9d7bb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/bpf/syscall.c
View File

@@ -4442,6 +4442,8 @@ static int bpf_prog_get_info_by_fd(struct file *file,
info.recursion_misses = stats.misses; info.recursion_misses = stats.misses;
info.verified_insns = prog->aux->verified_insns; info.verified_insns = prog->aux->verified_insns;
if (prog->aux->btf)
info.btf_id = btf_obj_id(prog->aux->btf);
if (!bpf_capable()) { if (!bpf_capable()) {
info.jited_prog_len = 0; info.jited_prog_len = 0;
@@ -4588,8 +4590,6 @@ static int bpf_prog_get_info_by_fd(struct file *file,
} }
} }
if (prog->aux->btf)
info.btf_id = btf_obj_id(prog->aux->btf);
info.attach_btf_id = prog->aux->attach_btf_id; info.attach_btf_id = prog->aux->attach_btf_id;
if (attach_btf) if (attach_btf)
info.attach_btf_obj_id = btf_obj_id(attach_btf); info.attach_btf_obj_id = btf_obj_id(attach_btf);