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

Commit 85e27fe8 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Greg Kroah-Hartman
Browse files

brcmfmac: fix memory leak in brcmf_fill_bss_param 



commit 23e9c128adb2038c27a424a5f91136e7fa3e0dc6 upstream.

This function is called from get_station callback which means that every
time user space was getting/dumping station(s) we were leaking 2 KiB.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Fixes: 1f0dc59a ("brcmfmac: rework .get_station() callback")
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6281c088

drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c

+4 −1
Original line number Diff line number Diff line
@@ -2408,7 +2408,7 @@ static void brcmf_fill_bss_param(struct brcmf_if *ifp, struct station_info *si) 
				     WL_BSS_INFO_MAX);

	if (err) {

		brcmf_err("Failed to get bss info (%d)\n", err);

		return;

		goto out_kfree;

	}

	si->filled |= BIT(NL80211_STA_INFO_BSS_PARAM);

	si->bss_param.beacon_interval = le16_to_cpu(buf->bss_le.beacon_period);
@@ -2420,6 +2420,9 @@ static void brcmf_fill_bss_param(struct brcmf_if *ifp, struct station_info *si) 
		si->bss_param.flags |= BSS_PARAM_FLAGS_SHORT_PREAMBLE;

	if (capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)

		si->bss_param.flags |= BSS_PARAM_FLAGS_SHORT_SLOT_TIME;



out_kfree:

	kfree(buf);

}



static s32