| Message ID | a03c9b9daa9f779937fce9f6050a05a2dfeaaeec.1443039304.git.daniel@iogearbox.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 9/23/15 1:20 PM, Daniel Borkmann wrote: > Similarly as already the case in bpf_redirect()/skb_do_redirect() > pair, let the stack deal with devs that are !IFF_UP. > > dev_forward_skb() as well as dev_queue_xmit() will free the skb > and increment drop counter internally in such cases, so we can > spare the condition in bpf_clone_redirect(). > > Signed-off-by: Daniel Borkmann<daniel@iogearbox.net> thanks. was about to send the same fix. Acked-by: Alexei Starovoitov <ast@plumgrid.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Daniel Borkmann <daniel@iogearbox.net> Date: Wed, 23 Sep 2015 22:20:15 +0200 > Similarly as already the case in bpf_redirect()/skb_do_redirect() > pair, let the stack deal with devs that are !IFF_UP. > > dev_forward_skb() as well as dev_queue_xmit() will free the skb > and increment drop counter internally in such cases, so we can > spare the condition in bpf_clone_redirect(). > > Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Applied, thanks Daniel. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/filter.c b/net/core/filter.c index da3f3d9..96bd962 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -1404,9 +1404,6 @@ static u64 bpf_clone_redirect(u64 r1, u64 ifindex, u64 flags, u64 r4, u64 r5) if (unlikely(!dev)) return -EINVAL; - if (unlikely(!(dev->flags & IFF_UP))) - return -EINVAL; - skb2 = skb_clone(skb, GFP_ATOMIC); if (unlikely(!skb2)) return -ENOMEM;
Similarly as already the case in bpf_redirect()/skb_do_redirect() pair, let the stack deal with devs that are !IFF_UP. dev_forward_skb() as well as dev_queue_xmit() will free the skb and increment drop counter internally in such cases, so we can spare the condition in bpf_clone_redirect(). Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> --- net/core/filter.c | 3 --- 1 file changed, 3 deletions(-)