Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efbc7600 authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman
Browse files

mac80211: Free mpath object when rhashtable insertion fails 



commit 4ff3a9d14c6c06eaa4e5976c61599ea2bd9e81b2 upstream.

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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent badcc565

net/mac80211/mesh_pathtbl.c

+9 −8
Original line number Diff line number Diff line
@@ -449,17 +449,15 @@ struct mesh_path *mesh_path_add(struct ieee80211_sub_if_data *sdata, 


	} 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);

		new_mpath = mpath;

	}



	sdata->u.mesh.mesh_paths_generation++;

	return new_mpath;

}
@@ -489,6 +487,9 @@ int mpp_path_add(struct ieee80211_sub_if_data *sdata, 
					    &new_mpath->rhash,

					    mesh_rht_params);



	if (ret)

		kfree(new_mpath);



	sdata->u.mesh.mpp_paths_generation++;

	return ret;

}