[PATCH 2/2] mac80211: Free mpath object when rhashtable insertion fails

Herbert Xu
2019-02-13T05:16:26Z

When rhashtable insertion fails the mesh table code doesn't free
the now-orphan mesh path object. This patch fixes that.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

net/mac80211/mesh_pathtbl.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 984ed433a8bc..93fdd9a7d72c 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -432,17 +432,18 @@ struct mesh_path *mesh_path_add(struct ieee80211_sub_if_data *sdata,
hlist_add_head(&new_mpath->walk_list, &tbl->walk_head);
} while (unlikely(ret == -EEXIST && !mpath));

- if (ret && ret != -EEXIST)
+ if (ret)
+ kfree(new_mpath);
+
+ if (ret != -EEXIST)
return ERR_PTR(ret);

/* At this point either new_mpath was added, or we found a
* matching entry already in the table; in the latter case
* free the unnecessary new entry.
*/
- if (ret == -EEXIST) {
- kfree(new_mpath);
+ if (ret == -EEXIST)
new_mpath = mpath;
- }
sdata->u.mesh.mesh_paths_generation++;
return new_mpath;
}
@@ -473,6 +474,8 @@ int mpp_path_add(struct ieee80211_sub_if_data *sdata,
mesh_rht_params);
if (!ret)
hlist_add_head(&new_mpath->walk_list, &tbl->walk_head);
+ else
+ kfree(new_mpath);

sdata->u.mesh.mpp_paths_generation++;
return ret;