Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 721e08da authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by David S. Miller
Browse files

bpf: Fix compiler warning on info.map_ids for 32bit platform 



This patch uses u64_to_user_ptr() to cast info.map_ids to a userspace ptr.
It also tags the user_map_ids with '__user' for sparse check.

Fixes: cb4d2b3f ("bpf: Add name, load_time, uid and map_ids to bpf_prog_info")
Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1c49d14

kernel/bpf/syscall.c

+1 −1
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog, 
	info.nr_map_ids = prog->aux->used_map_cnt;

	ulen = min_t(u32, info.nr_map_ids, ulen);

	if (ulen) {

		u32 *user_map_ids = (u32 *)info.map_ids;

		u32 __user *user_map_ids = u64_to_user_ptr(info.map_ids);

		u32 i;



		for (i = 0; i < ulen; i++)