* [PATCH net] bpf: Fix bpf_xdp_event_output
@ 2017-02-23 18:40 Martin KaFai Lau
2017-02-23 18:49 ` Daniel Borkmann
2017-02-23 18:56 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Martin KaFai Lau @ 2017-02-23 18:40 UTC (permalink / raw)
To: netdev; +Cc: Kernel Team, Daniel Borkmann
Fix a typo. xdp->data instead of xdp should be copied to the perf-event's
dst_buff.
Fixes: 4de16969523c ("bpf: enable event output helper also for xdp types")
Reported-by: Huapeng Zhou <hzhou@fb.com>
Tested-by: Feixiong Zhang <feixiong@fb.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
---
net/core/filter.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/filter.c b/net/core/filter.c
index e466e0040137..ebaeaf2e46e8 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2584,8 +2584,8 @@ BPF_CALL_5(bpf_xdp_event_output, struct xdp_buff *, xdp, struct bpf_map *, map,
if (unlikely(xdp_size > (unsigned long)(xdp->data_end - xdp->data)))
return -EFAULT;
- return bpf_event_output(map, flags, meta, meta_size, xdp, xdp_size,
- bpf_xdp_copy);
+ return bpf_event_output(map, flags, meta, meta_size, xdp->data,
+ xdp_size, bpf_xdp_copy);
}
static const struct bpf_func_proto bpf_xdp_event_output_proto = {
--
2.5.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] bpf: Fix bpf_xdp_event_output
2017-02-23 18:40 [PATCH net] bpf: Fix bpf_xdp_event_output Martin KaFai Lau
@ 2017-02-23 18:49 ` Daniel Borkmann
2017-02-23 18:56 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2017-02-23 18:49 UTC (permalink / raw)
To: Martin KaFai Lau, netdev; +Cc: Kernel Team
On 02/23/2017 07:40 PM, Martin KaFai Lau wrote:
> Fix a typo. xdp->data instead of xdp should be copied to the perf-event's
> dst_buff.
>
> Fixes: 4de16969523c ("bpf: enable event output helper also for xdp types")
> Reported-by: Huapeng Zhou <hzhou@fb.com>
> Tested-by: Feixiong Zhang <feixiong@fb.com>
> Acked-by: Alexei Starovoitov <ast@kernel.org>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] bpf: Fix bpf_xdp_event_output
2017-02-23 18:40 [PATCH net] bpf: Fix bpf_xdp_event_output Martin KaFai Lau
2017-02-23 18:49 ` Daniel Borkmann
@ 2017-02-23 18:56 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-02-23 18:56 UTC (permalink / raw)
To: kafai; +Cc: netdev, kernel-team, daniel
From: Martin KaFai Lau <kafai@fb.com>
Date: Thu, 23 Feb 2017 10:40:34 -0800
> Fix a typo. xdp->data instead of xdp should be copied to the perf-event's
> dst_buff.
>
> Fixes: 4de16969523c ("bpf: enable event output helper also for xdp types")
> Reported-by: Huapeng Zhou <hzhou@fb.com>
> Tested-by: Feixiong Zhang <feixiong@fb.com>
> Acked-by: Alexei Starovoitov <ast@kernel.org>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-23 18:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-23 18:40 [PATCH net] bpf: Fix bpf_xdp_event_output Martin KaFai Lau
2017-02-23 18:49 ` Daniel Borkmann
2017-02-23 18:56 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox