diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2019-02-14 22:03:25 +0800 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2019-02-15 13:10:32 +0100 |
| commit | 4ff3a9d14c6c06eaa4e5976c61599ea2bd9e81b2 (patch) | |
| tree | 200760df5220490d556c827891bb4abfdcdf1aa0 /net/mac80211 | |
| parent | mac80211: Use linked list instead of rhashtable walk for mesh tables (diff) | |
| download | linux-dev-4ff3a9d14c6c06eaa4e5976c61599ea2bd9e81b2.tar.xz linux-dev-4ff3a9d14c6c06eaa4e5976c61599ea2bd9e81b2.zip | |
mac80211: Free mpath object when rhashtable insertion fails
When rhashtable insertion fails the mesh table code doesn't free
the now-orphan mesh path object. This patch fixes that.
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mesh_pathtbl.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 884a0d212e8b..c3a7396fb955 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c @@ -436,17 +436,15 @@ struct mesh_path *mesh_path_add(struct ieee80211_sub_if_data *sdata, } while (unlikely(ret == -EEXIST && !mpath)); spin_unlock_bh(&tbl->walk_lock); - if (ret && 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) { + if (ret) { kfree(new_mpath); + + if (ret != -EEXIST) + return ERR_PTR(ret); + new_mpath = mpath; } + sdata->u.mesh.mesh_paths_generation++; return new_mpath; } @@ -481,6 +479,9 @@ int mpp_path_add(struct ieee80211_sub_if_data *sdata, hlist_add_head_rcu(&new_mpath->walk_list, &tbl->walk_head); spin_unlock_bh(&tbl->walk_lock); + if (ret) + kfree(new_mpath); + sdata->u.mesh.mpp_paths_generation++; return ret; } |