summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-04-29 09:08:22 +0000
committerDavid S. Miller <davem@davemloft.net>2012-05-01 13:40:48 -0400
commit116a0fc31c6c9b8fc821be5a96e5bf0b43260131 (patch)
treef4b8561387b34fd4eec9b8a2d599937b2375d741 /net/sched
parente072b3fad5f3915102c94628b4971f52ff99dd05 (diff)
downloadlinux-stable-116a0fc31c6c9b8fc821be5a96e5bf0b43260131.tar.gz
linux-stable-116a0fc31c6c9b8fc821be5a96e5bf0b43260131.tar.bz2
linux-stable-116a0fc31c6c9b8fc821be5a96e5bf0b43260131.zip
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: Eric Dumazet <edumazet@google.com> Cc: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_netem.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 5da548fa7ae9..ebd22966f748 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -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 (!(skb = skb_unshare(skb, GFP_ATOMIC)) ||
(skb->ip_summed == CHECKSUM_PARTIAL &&
- skb_checksum_help(skb))) {
- sch->qstats.drops++;
- return NET_XMIT_DROP;
- }
+ skb_checksum_help(skb)))
+ return qdisc_drop(skb, sch);
skb->data[net_random() % skb_headlen(skb)] ^= 1<<(net_random() % 8);
}