Commit 8a6e9c67 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net_sched: netem: do not call qdisc_drop() with a NULL skb

If skb_unshare() fails, we call qdisc_drop() with a NULL skb, which
is no longer supported.

Fixes: 520ac30f ("net_sched: drop packets after root qdisc lock is released")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c973f24d
...@@ -487,10 +487,14 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, ...@@ -487,10 +487,14 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,
skb = segs; skb = segs;
segs = segs->next; segs = segs->next;
if (!(skb = skb_unshare(skb, GFP_ATOMIC)) || skb = skb_unshare(skb, GFP_ATOMIC);
(skb->ip_summed == CHECKSUM_PARTIAL && if (unlikely(!skb)) {
skb_checksum_help(skb))) { qdisc_qstats_drop(sch);
rc = qdisc_drop(skb, sch, to_free); goto finish_segs;
}
if (skb->ip_summed == CHECKSUM_PARTIAL &&
skb_checksum_help(skb)) {
qdisc_drop(skb, sch, to_free);
goto finish_segs; goto finish_segs;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment