Skip to content

Commit

Permalink
can: gw: synchronize rcu operations before removing gw job entry
Browse files Browse the repository at this point in the history
commit fb8696a 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: c1aabdf ("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>
  • Loading branch information
hartkopp authored and gregkh committed Jul 14, 2021
1 parent 014f8ba commit 2e934de
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions net/can/gw.c
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,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);
}
}
Expand Down Expand Up @@ -1154,6 +1155,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);
}
}
Expand Down Expand Up @@ -1222,6 +1224,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;
Expand Down

0 comments on commit 2e934de

Please sign in to comment.