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

Commit da33e3eb authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[PKT_SCHED] sch_htb: Use hlist_del_init(). 



Otherwise we can hit paths that (legally) do multiple deletes on the
same node and OOPS with the HLIST poison values there instead of
NULL.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e950efa

net/sched/sch_htb.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1284,8 +1284,7 @@ static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl) 
						  struct htb_class, sibling));

						  struct htb_class, sibling));





	/* note: this delete may happen twice (see htb_delete) */

	/* note: this delete may happen twice (see htb_delete) */

	if (!hlist_unhashed(&cl->hlist))

	hlist_del_init(&cl->hlist);

		hlist_del(&cl->hlist);

	list_del(&cl->sibling);

	list_del(&cl->sibling);





	if (cl->prio_activity)

	if (cl->prio_activity)
@@ -1333,8 +1332,7 @@ static int htb_delete(struct Qdisc *sch, unsigned long arg) 
	sch_tree_lock(sch);

	sch_tree_lock(sch);





	/* delete from hash and active; remainder in destroy_class */

	/* delete from hash and active; remainder in destroy_class */

	if (!hlist_unhashed(&cl->hlist))

	hlist_del_init(&cl->hlist);

		hlist_del(&cl->hlist);





	if (cl->prio_activity)

	if (cl->prio_activity)

		htb_deactivate(q, cl);

		htb_deactivate(q, cl);