[PATCH net-next] bpf: Fix compiler warning on info.map_ids for 32bit platform

Subsystems: bpf [core], bpf [general] (safe dynamic programs and tools), the rest

STALE3265d

3 messages, 3 authors, 2017-10-01 · open the first message on its own page

[PATCH net-next] bpf: Fix compiler warning on info.map_ids for 32bit platform

From: Martin KaFai Lau <hidden>
Date: 2017-09-29 17:52:19

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: cb4d2b3f03d8 ("bpf: Add name, load_time, uid and map_ids to bpf_prog_info")
Signed-off-by: Martin KaFai Lau <redacted>
---
 kernel/bpf/syscall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 11a7f82a55d1..b927da66f653 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -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++)
-- 
2.9.5

Re: [PATCH net-next] bpf: Fix compiler warning on info.map_ids for 32bit platform

From: Daniel Borkmann <daniel@iogearbox.net>
Date: 2017-09-30 19:05:26

On 09/29/2017 07:52 PM, Martin KaFai Lau wrote:
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: cb4d2b3f03d8 ("bpf: Add name, load_time, uid and map_ids to bpf_prog_info")
Signed-off-by: Martin KaFai Lau <redacted>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>

Re: [PATCH net-next] bpf: Fix compiler warning on info.map_ids for 32bit platform

From: David Miller <davem@davemloft.net>
Date: 2017-10-01 03:11:06

From: Martin KaFai Lau <redacted>
Date: Fri, 29 Sep 2017 10:52:17 -0700
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: cb4d2b3f03d8 ("bpf: Add name, load_time, uid and map_ids to bpf_prog_info")
Signed-off-by: Martin KaFai Lau <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help