batman-adv/patches/0006-batman-adv-Fix-bat_ogm_iv-best-gw-refcnt-after-netli.patch

   1 From: Sven Eckelmann <sven@narfation.org>
   2 Date: Sat, 2 Jun 2018 17:26:34 +0200
   3 Subject: [PATCH] batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump
   4
   5 A reference for the best gateway is taken when the list of gateways in the
   6 mesh is sent via netlink. This is necessary to check whether the currently
   7 dumped entry is the currently selected gateway or not. This information is
   8 then transferred as flag BATADV_ATTR_FLAG_BEST.
   9
  10 After the comparison of the current entry is done,
  11 batadv_iv_gw_dump_entry() has to decrease the reference counter again.
  12 Otherwise the reference will be held and thus prevents a proper shutdown of
  13 the batman-adv interfaces (and some of the interfaces enslaved in it).
  14
  15 Fixes: fa3228924152 ("batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations")
  16 Reported-by: Andreas Ziegler <dev@andreas-ziegler.de>
  17 Tested-by: Andreas Ziegler <dev@andreas-ziegler.de>
  18 Signed-off-by: Sven Eckelmann <sven@narfation.org>
  19 Acked-by: Marek Lindner <mareklindner@neomailbox.ch>
  20
  21 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/46360d203c627e71a27d1f8f551c819c7f2353fd
  22 ---
  23  net/batman-adv/bat_iv_ogm.c | 4 +++-
  24  1 file changed, 3 insertions(+), 1 deletion(-)
  25
  26 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
  27 index be09a98838252f4f0c23cec0625930cf896cd0ff..73bf6a93a3cf1141a34657bf1284893199e04db9 100644
  28 --- a/net/batman-adv/bat_iv_ogm.c
  29 +++ b/net/batman-adv/bat_iv_ogm.c
  30 @@ -2732,7 +2732,7 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
  31  {
  32         struct batadv_neigh_ifinfo *router_ifinfo = NULL;
  33         struct batadv_neigh_node *router;
  34 -       struct batadv_gw_node *curr_gw;
  35 +       struct batadv_gw_node *curr_gw = NULL;
  36         int ret = 0;
  37         void *hdr;
  38
  39 @@ -2780,6 +2780,8 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
  40         ret = 0;
  41
  42  out:
  43 +       if (curr_gw)
  44 +               batadv_gw_node_put(curr_gw);
  45         if (router_ifinfo)
  46                 batadv_neigh_ifinfo_put(router_ifinfo);
  47         if (router)