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

Commit f81b864f authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Greg Kroah-Hartman
Browse files

net: sched: consistently use rcu_replace_pointer() in taprio_change() 

[ Upstream commit d5c4546062fd6f5dbce575c7ea52ad66d1968678 ]

According to Vinicius (and carefully looking through the whole
https://syzkaller.appspot.com/bug?extid=b65e0af58423fc8a73aa


once again), txtime branch of 'taprio_change()' is not going to
race against 'advance_sched()'. But using 'rcu_replace_pointer()'
in the former may be a good idea as well.

Suggested-by: default avatarVinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Acked-by: default avatarVinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f2c2c674

net/sched/sch_taprio.c

+3 −1
Original line number Diff line number Diff line
@@ -1578,7 +1578,9 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt, 
			goto unlock;

		}



		rcu_assign_pointer(q->admin_sched, new_admin);

		/* Not going to race against advance_sched(), but still */

		admin = rcu_replace_pointer(q->admin_sched, new_admin,

					    lockdep_rtnl_is_held());

		if (admin)

			call_rcu(&admin->rcu, taprio_free_sched_cb);

	} else {