[maint,1/2] batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump

Message ID 20180602152635.2923-1-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 46360d203c627e71a27d1f8f551c819c7f2353fd
Delegated to: Simon Wunderlich
Headers
Series [maint,1/2] batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump |

Commit Message

Sven Eckelmann June 2, 2018, 3:26 p.m. UTC
  A reference to the best gateway is taken when the list of gateways in the
mesh is sent via netlink. This is necessary to check whether the currently
dumped entry is the currently selected gateway or not. This information is
then transferred as flag BATADV_ATTR_FLAG_BEST.

After the comparison of the current entry is done,
batadv_iv_gw_dump_entry() has to decrease the reference counter again.
Otherwise the reference will be held and thus prevents a proper shutdown of
the batman-adv interfaces (and some of the interfaces enslaved in it).

Fixes: fa3228924152 ("batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations")
Reported-by: Andreas Ziegler <github@andreas-ziegler.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Cc: Andreas Ziegler <github@andreas-ziegler.de>

 net/batman-adv/bat_iv_ogm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
  

Comments

Marek Lindner June 3, 2018, 10:53 a.m. UTC | #1
On Saturday, June 2, 2018 11:26:34 PM HKT Sven Eckelmann wrote:
> A reference to the best gateway is taken when the list of gateways in the
> mesh is sent via netlink. This is necessary to check whether the currently
> dumped entry is the currently selected gateway or not. This information is
> then transferred as flag BATADV_ATTR_FLAG_BEST.
> 
> After the comparison of the current entry is done,
> batadv_iv_gw_dump_entry() has to decrease the reference counter again.
> Otherwise the reference will be held and thus prevents a proper shutdown of
> the batman-adv interfaces (and some of the interfaces enslaved in it).
> 
> Fixes: fa3228924152 ("batman-adv: add B.A.T.M.A.N. IV bat_gw_dump
> implementations") Reported-by: Andreas Ziegler <github@andreas-ziegler.de>
> Signed-off-by: Sven Eckelmann <sven@narfation.org>

Acked-by: Marek Lindner <mareklindner@neomailbox.ch>

Cheers,
Marek
  
Andreas Ziegler June 3, 2018, 1:02 p.m. UTC | #2
Tested-by: Andreas Ziegler <dev@andreas-ziegler.de>

Sven Eckelmann schrieb am 02.06.2018 um 17:26:
> A reference to the best gateway is taken when the list of gateways in the
> mesh is sent via netlink. This is necessary to check whether the currently
> dumped entry is the currently selected gateway or not. This information is
> then transferred as flag BATADV_ATTR_FLAG_BEST.
> 
> After the comparison of the current entry is done,
> batadv_iv_gw_dump_entry() has to decrease the reference counter again.
> Otherwise the reference will be held and thus prevents a proper shutdown of
> the batman-adv interfaces (and some of the interfaces enslaved in it).
> 
> Fixes: fa3228924152 ("batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations")
> Reported-by: Andreas Ziegler <github@andreas-ziegler.de>
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> Cc: Andreas Ziegler <github@andreas-ziegler.de>
> 
>  net/batman-adv/bat_iv_ogm.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
> index be09a988..73bf6a93 100644
> --- a/net/batman-adv/bat_iv_ogm.c
> +++ b/net/batman-adv/bat_iv_ogm.c
> @@ -2732,7 +2732,7 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
>  {
>  	struct batadv_neigh_ifinfo *router_ifinfo = NULL;
>  	struct batadv_neigh_node *router;
> -	struct batadv_gw_node *curr_gw;
> +	struct batadv_gw_node *curr_gw = NULL;
>  	int ret = 0;
>  	void *hdr;
>  
> @@ -2780,6 +2780,8 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
>  	ret = 0;
>  
>  out:
> +	if (curr_gw)
> +		batadv_gw_node_put(curr_gw);
>  	if (router_ifinfo)
>  		batadv_neigh_ifinfo_put(router_ifinfo);
>  	if (router)
>
  
Sven Eckelmann June 3, 2018, 1:14 p.m. UTC | #3
On Samstag, 2. Juni 2018 17:26:34 CEST Sven Eckelmann wrote:
> A reference to the best gateway is taken when the list of gateways in the
> mesh is sent via netlink. This is necessary to check whether the currently
> dumped entry is the currently selected gateway or not. This information is
> then transferred as flag BATADV_ATTR_FLAG_BEST.
> 
> After the comparison of the current entry is done,
> batadv_iv_gw_dump_entry() has to decrease the reference counter again.
> Otherwise the reference will be held and thus prevents a proper shutdown of
> the batman-adv interfaces (and some of the interfaces enslaved in it).
> 
> Fixes: fa3228924152 ("batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations")
> Reported-by: Andreas Ziegler <github@andreas-ziegler.de>
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> Cc: Andreas Ziegler <github@andreas-ziegler.de>

Added as 46360d203c62 [1]

Kind regards,
	Sven

[1] https://git.open-mesh.org/batman-adv.git/commit/46360d203c627e71a27d1f8f551c819c7f2353fd
  

Patch

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index be09a988..73bf6a93 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -2732,7 +2732,7 @@  static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
 {
 	struct batadv_neigh_ifinfo *router_ifinfo = NULL;
 	struct batadv_neigh_node *router;
-	struct batadv_gw_node *curr_gw;
+	struct batadv_gw_node *curr_gw = NULL;
 	int ret = 0;
 	void *hdr;
 
@@ -2780,6 +2780,8 @@  static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
 	ret = 0;
 
 out:
+	if (curr_gw)
+		batadv_gw_node_put(curr_gw);
 	if (router_ifinfo)
 		batadv_neigh_ifinfo_put(router_ifinfo);
 	if (router)