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

Commit eb101924 authored by Hagen Paul Pfeifer's avatar Hagen Paul Pfeifer Committed by David S. Miller
Browse files

net_sched: Bug in netem reordering 



Not now, but it looks you are correct. q->qdisc is NULL until another
additional qdisc is attached (beside tfifo). See 50612537.
The following patch should work.

From: Hagen Paul Pfeifer <hagen@jauu.net>

netem: catch NULL pointer by updating the real qdisc statistic

Reported-by: default avatarVijay Subramanian <subramanian.vijay@gmail.com>
Signed-off-by: default avatarHagen Paul Pfeifer <hagen@jauu.net>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1e0918f

net/sched/sch_netem.c

+2 −2
Original line number Diff line number Diff line
@@ -458,8 +458,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
		q->counter = 0;



		__skb_queue_head(&sch->q, skb);

		q->qdisc->qstats.backlog += qdisc_pkt_len(skb);

		q->qdisc->qstats.requeues++;

		sch->qstats.backlog += qdisc_pkt_len(skb);

		sch->qstats.requeues++;

		ret = NET_XMIT_SUCCESS;

	}