diff options
author | Oliver Hartkopp <socketcan@hartkopp.net> | 2021-06-18 19:36:45 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-14 16:53:04 +0200 |
commit | 7bb931d2c8cf3282ea49d31ffea6e7525976ac1f (patch) | |
tree | b9715aab4b6d24a7c313432f9053202ebf662704 | |
parent | 70a9116b9e5ccd5332d3a60b359fb5902d268fd0 (diff) | |
download | linux-stable-7bb931d2c8cf3282ea49d31ffea6e7525976ac1f.tar.gz linux-stable-7bb931d2c8cf3282ea49d31ffea6e7525976ac1f.tar.bz2 linux-stable-7bb931d2c8cf3282ea49d31ffea6e7525976ac1f.zip |
can: gw: synchronize rcu operations before removing gw job entry
commit fb8696ab14adadb2e3f6c17c18ed26b3ecd96691 upstream.
can_can_gw_rcv() is called under RCU protection, so after calling
can_rx_unregister(), we have to call synchronize_rcu in order to wait
for any RCU read-side critical sections to finish before removing the
kmem_cache entry with the referenced gw job entry.
Link: https://lore.kernel.org/r/20210618173645.2238-1-socketcan@hartkopp.net
Fixes: c1aabdf379bc ("can-gw: add netlink based CAN routing")
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | net/can/gw.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/can/gw.c b/net/can/gw.c index 65d60c93af29..ac2a5f11a766 100644 --- a/net/can/gw.c +++ b/net/can/gw.c @@ -535,6 +535,7 @@ static int cgw_notifier(struct notifier_block *nb, if (gwj->src.dev == dev || gwj->dst.dev == dev) { hlist_del(&gwj->list); cgw_unregister_filter(net, gwj); + synchronize_rcu(); kmem_cache_free(cgw_cache, gwj); } } @@ -1093,6 +1094,7 @@ static void cgw_remove_all_jobs(struct net *net) hlist_for_each_entry_safe(gwj, nx, &net->can.cgw_list, list) { hlist_del(&gwj->list); cgw_unregister_filter(net, gwj); + synchronize_rcu(); kmem_cache_free(cgw_cache, gwj); } } @@ -1161,6 +1163,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh, hlist_del(&gwj->list); cgw_unregister_filter(net, gwj); + synchronize_rcu(); kmem_cache_free(cgw_cache, gwj); err = 0; break; |