Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e2c3aea authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

net: also make sch_handle_egress() drop monitor ready 



Follow-up for 8a3a4c6e ("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: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15db6e0d

net/core/dev.c

+3 −3
Original line number Diff line number Diff line
@@ -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! */