On 11/07/2011 03:28 AM, Jesper Juhl wrote:
> If kmemdup() fails we leak the memory allocated to bss_desc.
> This patch fixes the leak.
> I also removed the pointless default assignment of 'NULL' to 'bss_desc'
> while I was there anyway.
>
> Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Looks good to me.
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@xxxxxxxxxxxxxxxxxx>
Thanks,
Srivatsa S. Bhat
> ---
> drivers/net/wireless/mwifiex/scan.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> note: patch is compile tested only since I don't have the hardware.
>
> diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
> index dae8dbb..8a3f959 100644
> --- a/drivers/net/wireless/mwifiex/scan.c
> +++ b/drivers/net/wireless/mwifiex/scan.c
> @@ -1469,7 +1469,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid,
> s32 rssi, const u8 *ie_buf, size_t ie_len,
> u16 beacon_period, u16 cap_info_bitmap, u8 band)
> {
> - struct mwifiex_bssdescriptor *bss_desc = NULL;
> + struct mwifiex_bssdescriptor *bss_desc;
> int ret;
> unsigned long flags;
> u8 *beacon_ie;
> @@ -1484,6 +1484,7 @@ mwifiex_update_curr_bss_params(struct mwifiex_private *priv, u8 *bssid,
>
> beacon_ie = kmemdup(ie_buf, ie_len, GFP_KERNEL);
> if (!beacon_ie) {
> + kfree(bss_desc);
> dev_err(priv->adapter->dev, " failed to alloc beacon_ie\n");
> return -ENOMEM;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
