]> www.infradead.org Git - users/jedix/linux-maple.git/commit
batman-adv: Avoid recursive call_rcu for batadv_nc_node
authorSven Eckelmann <sven@narfation.org>
Tue, 5 Jan 2016 11:06:19 +0000 (12:06 +0100)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:43:30 +0000 (15:43 -0700)
commitc785f7ea7ad85d9341648dbf0f9da4aef7204b53
treebf88c064590f39efeead3bf81718ac2fb3af6af4
parentc5ca20716fb1f6f74e9477ff3b169a38edfd9cc9
batman-adv: Avoid recursive call_rcu for batadv_nc_node

Orabug: 23330570

[ Upstream commit 44e8e7e91d6c7c7ab19688750f7257292640d1a0 ]

The batadv_nc_node_free_ref function uses call_rcu to delay the free of the
batadv_nc_node object until no (already started) rcu_read_lock is enabled
anymore. This makes sure that no context is still trying to access the
object which should be removed. But batadv_nc_node also contains a
reference to orig_node which must be removed.

The reference drop of orig_node was done in the call_rcu function
batadv_nc_node_free_rcu but should actually be done in the
batadv_nc_node_release function to avoid nested call_rcus. This is
important because rcu_barrier (e.g. batadv_softif_free or batadv_exit) will
not detect the inner call_rcu as relevant for its execution. Otherwise this
barrier will most likely be inserted in the queue before the callback of
the first call_rcu was executed. The caller of rcu_barrier will therefore
continue to run before the inner call_rcu callback finished.

Fixes: d56b1705e28c ("batman-adv: network coding - detect coding nodes and remove these after timeout")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 34c5bf7c7bf4e285274e28a36b08cbf3da5bd3e3)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
net/batman-adv/network-coding.c