diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2024-09-04 14:54:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-10 12:00:16 +0200 |
| commit | 7aab724c602bf4b7e7bd19c88c69ca7a0b5564c8 (patch) | |
| tree | 4ebeb732321ecc245000dca16a6271d1af92874a /net | |
| parent | 846d5bb4c1e7bcbe3887b16a67c379c545e07d3c (diff) | |
| download | linux-stable-7aab724c602bf4b7e7bd19c88c69ca7a0b5564c8.tar.gz linux-stable-7aab724c602bf4b7e7bd19c88c69ca7a0b5564c8.tar.bz2 linux-stable-7aab724c602bf4b7e7bd19c88c69ca7a0b5564c8.zip | |
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: 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/sch_taprio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c index b284a06b5a75..847e1cc6052e 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 { |