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

Commit 116a0fc3 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

netem: fix possible skb leak 



skb_checksum_help(skb) can return an error, we must free skb in this
case. qdisc_drop(skb, sch) can also be feeded with a NULL skb (if
skb_unshare() failed), so lets use this generic helper.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e072b3fa

net/sched/sch_netem.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -408,10 +408,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	if (q->corrupt && q->corrupt >= get_crandom(&q->corrupt_cor)) {

	if (q->corrupt && q->corrupt >= get_crandom(&q->corrupt_cor)) {

		if (!(skb = skb_unshare(skb, GFP_ATOMIC)) ||

		if (!(skb = skb_unshare(skb, GFP_ATOMIC)) ||

		    (skb->ip_summed == CHECKSUM_PARTIAL &&

		    (skb->ip_summed == CHECKSUM_PARTIAL &&

		     skb_checksum_help(skb))) {

		     skb_checksum_help(skb)))

			sch->qstats.drops++;

			return qdisc_drop(skb, sch);

			return NET_XMIT_DROP;

		}





		skb->data[net_random() % skb_headlen(skb)] ^= 1<<(net_random() % 8);

		skb->data[net_random() % skb_headlen(skb)] ^= 1<<(net_random() % 8);

	}

	}