netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bpf: fix size of copy_to_user in percpu map.
@ 2016-07-29  0:42 William Tu
  2016-07-29  6:47 ` Alexei Starovoitov
  0 siblings, 1 reply; 14+ messages in thread
From: William Tu @ 2016-07-29  0:42 UTC (permalink / raw)
  To: netdev

The total size of value copy_to_user() writes to userspace should
be the (current number of cpu) * (value size), instead of
num_possible_cpus() * (value size).  Found by samples/bpf/test_maps.c,
which always copies 512 byte to userspace, crashing the userspace
program stack.

Signed-off-by: William Tu <u9012063@gmail.com>
---
 kernel/bpf/syscall.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 228f962..47f738e 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -324,7 +324,8 @@ static int map_lookup_elem(union bpf_attr *attr)
 		goto free_value;
 
 	err = -EFAULT;
-	if (copy_to_user(uvalue, value, value_size) != 0)
+	if (copy_to_user(uvalue, value,
+		map->value_size * num_online_cpus()) != 0)
 		goto free_value;
 
 	err = 0;
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2016-08-25  7:06 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-29  0:42 [PATCH] bpf: fix size of copy_to_user in percpu map William Tu
2016-07-29  6:47 ` Alexei Starovoitov
2016-07-29  7:54   ` Daniel Borkmann
2016-07-29 20:03     ` William Tu
2016-07-30  0:19       ` Daniel Borkmann
2016-07-30  5:23         ` William Tu
2016-07-30  5:34           ` Alexei Starovoitov
2016-07-31 15:25             ` William Tu
2016-08-01 16:07               ` Alexei Starovoitov
2016-08-01 16:30                 ` William Tu
2016-08-12 16:58                   ` William Tu
2016-08-12 23:08                     ` Alexei Starovoitov
2016-08-19  1:38                       ` William Tu
2016-08-24 23:46                         ` William Tu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).