Skip to content

Commit 12e407a

Browse files
T-Xgregkh
authored andcommitted
mac80211: fix potential double free on mesh join
commit 4a2d449 upstream. While commit 6a01afc ("mac80211: mesh: Free ie data when leaving mesh") fixed a memory leak on mesh leave / teardown it introduced a potential memory corruption caused by a double free when rejoining the mesh: ieee80211_leave_mesh() -> kfree(sdata->u.mesh.ie); ... ieee80211_join_mesh() -> copy_mesh_setup() -> old_ie = ifmsh->ie; -> kfree(old_ie); This double free / kernel panics can be reproduced by using wpa_supplicant with an encrypted mesh (if set up without encryption via "iw" then ifmsh->ie is always NULL, which avoids this issue). And then calling: $ iw dev mesh0 mesh leave $ iw dev mesh0 mesh join my-mesh Note that typically these commands are not used / working when using wpa_supplicant. And it seems that wpa_supplicant or wpa_cli are going through a NETDEV_DOWN/NETDEV_UP cycle between a mesh leave and mesh join where the NETDEV_UP resets the mesh.ie to NULL via a memcpy of default_mesh_setup in cfg80211_netdev_notifier_call, which then avoids the memory corruption, too. The issue was first observed in an application which was not using wpa_supplicant but "Senf" instead, which implements its own calls to nl80211. Fixing the issue by removing the kfree()'ing of the mesh IE in the mesh join function and leaving it solely up to the mesh leave to free the mesh IE. Cc: stable@vger.kernel.org Fixes: 6a01afc ("mac80211: mesh: Free ie data when leaving mesh") Reported-by: Matthias Kretschmer <mathias.kretschmer@fit.fraunhofer.de> Signed-off-by: Linus Lüssing <ll@simonwunderlich.de> Tested-by: Mathias Kretschmer <mathias.kretschmer@fit.fraunhofer.de> Link: https://lore.kernel.org/r/20220310183513.28589-1-linus.luessing@c0d3.blue Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e65d28d commit 12e407a

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

net/mac80211/cfg.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2110,14 +2110,12 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,
21102110
const struct mesh_setup *setup)
21112111
{
21122112
u8 *new_ie;
2113-
const u8 *old_ie;
21142113
struct ieee80211_sub_if_data *sdata = container_of(ifmsh,
21152114
struct ieee80211_sub_if_data, u.mesh);
21162115
int i;
21172116

21182117
/* allocate information elements */
21192118
new_ie = NULL;
2120-
old_ie = ifmsh->ie;
21212119

21222120
if (setup->ie_len) {
21232121
new_ie = kmemdup(setup->ie, setup->ie_len,
@@ -2127,7 +2125,6 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,
21272125
}
21282126
ifmsh->ie_len = setup->ie_len;
21292127
ifmsh->ie = new_ie;
2130-
kfree(old_ie);
21312128

21322129
/* now copy the rest of the setup parameters */
21332130
ifmsh->mesh_id_len = setup->mesh_id_len;

0 commit comments

Comments
 (0)