summaryrefslogtreecommitdiff
path: root/net/sched
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2024-09-04 14:54:01 +0300
committerDavid S. Miller <davem@davemloft.net>2024-09-08 11:18:57 +0100
commitd5c4546062fd6f5dbce575c7ea52ad66d1968678 (patch)
treec9e73ae1cb2f0f3262003b980b08ed4ba00e4240 /net/sched
parentf723224742fc6d25f88a9d9036be4713398be65d (diff)
downloadlwn-d5c4546062fd6f5dbce575c7ea52ad66d1968678.tar.gz
lwn-d5c4546062fd6f5dbce575c7ea52ad66d1968678.zip
net: sched: consistently use rcu_replace_pointer() in taprio_change()
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: Vinicius Costa Gomes <vinicius.gomes@intel.com> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_taprio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index cc2df9f8c14a..8498d0606b24 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -1952,7 +1952,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 {