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

Commit 035832a2 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NET_SCHED]: Fix ingress locking 



Ingress queueing uses a seperate lock for serializing enqueue operations,
but fails to properly protect itself against concurrent changes to the
qdisc tree. Use queue_lock for now since the real fix it quite intrusive.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3fa76ee

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -1750,10 +1750,10 @@ static int ing_filter(struct sk_buff *skb) 


		skb->tc_verd = SET_TC_AT(skb->tc_verd,AT_INGRESS);



		spin_lock(&dev->ingress_lock);

		spin_lock(&dev->queue_lock);

		if ((q = dev->qdisc_ingress) != NULL)

			result = q->enqueue(skb, q);

		spin_unlock(&dev->ingress_lock);

		spin_unlock(&dev->queue_lock);



	}