OSDN Git Service

net: sched: do not requeue a NULL skb
authorLars Persson <lars.persson@axis.com>
Tue, 12 Apr 2016 06:45:52 +0000 (08:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 May 2016 00:06:35 +0000 (17:06 -0700)
commit5c136901ef17cd42d56b5c02135a0c67fb58424f
tree507188217fc8c98b30f1543839ad3a9d39dd1dc2
parenta416c9483c719cc9160b4b9af09085dfe461383f
net: sched: do not requeue a NULL skb

[ Upstream commit 3dcd493fbebfd631913df6e2773cc295d3bf7d22 ]

A failure in validate_xmit_skb_list() triggered an unconditional call
to dev_requeue_skb with skb=NULL. This slowly grows the queue
discipline's qlen count until all traffic through the queue stops.

We take the optimistic approach and continue running the queue after a
failure since it is unknown if later packets also will fail in the
validate path.

Fixes: 55a93b3ea780 ("qdisc: validate skb without holding lock")
Signed-off-by: Lars Persson <larper@axis.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/sched/sch_generic.c