diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2016-05-15 23:28:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-16 14:02:44 -0400 |
| commit | 7e2c3aea4398d079745b9faa2c17b6cbd010f221 (patch) | |
| tree | b92e30c372e9c7d19985fce38995ea6115e8bb16 | |
| parent | 15db6e0dc73ebdbf42c35f2f64907a5f4e154be1 (diff) | |
net: also make sch_handle_egress() drop monitor ready
Follow-up for 8a3a4c6e7b34 ("net: make sch_handle_ingress() drop
monitor ready") to also make the egress side drop monitor ready.
Also here only TC_ACT_SHOT is a clear indication that something
went wrong. Hence don't provide false positives to drop monitors
such as 'perf record -e skb:kfree_skb ...'.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 12436d1312ca..904ff431d570 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3186,12 +3186,12 @@ sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev) case TC_ACT_SHOT: qdisc_qstats_cpu_drop(cl->q); *ret = NET_XMIT_DROP; - goto drop; + kfree_skb(skb); + return NULL; case TC_ACT_STOLEN: case TC_ACT_QUEUED: *ret = NET_XMIT_SUCCESS; -drop: - kfree_skb(skb); + consume_skb(skb); return NULL; case TC_ACT_REDIRECT: /* No need to push/pop skb's mac_header here on egress! */ |