2010-07-31 16:34:18

by Kulikov Vasiliy

[permalink] [raw]
Subject: [PATCH] net: wl12xx: do not use kfree'd memory

wl1271_dump() uses cmd after kfree(cmd). Move kfree() just after
wl1271_dump().

Signed-off-by: Kulikov Vasiliy <[email protected]>
---
drivers/net/wireless/wl12xx/wl1271_spi.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c
index 96d25fb..4cb99c5 100644
--- a/drivers/net/wireless/wl12xx/wl1271_spi.c
+++ b/drivers/net/wireless/wl12xx/wl1271_spi.c
@@ -160,9 +160,8 @@ static void wl1271_spi_init(struct wl1271 *wl)
spi_message_add_tail(&t, &m);

spi_sync(wl_to_spi(wl), &m);
- kfree(cmd);
-
wl1271_dump(DEBUG_SPI, "spi init -> ", cmd, WSPI_INIT_CMD_LEN);
+ kfree(cmd);
}

#define WL1271_BUSY_WORD_TIMEOUT 1000
--
1.7.0.4



2010-08-02 05:04:39

by Juuso Oikarinen

[permalink] [raw]
Subject: Re: [PATCH] net: wl12xx: do not use kfree'd memory

On Sat, 2010-07-31 at 18:33 +0200, ext Kulikov Vasiliy wrote:
> wl1271_dump() uses cmd after kfree(cmd). Move kfree() just after
> wl1271_dump().
>
> Signed-off-by: Kulikov Vasiliy <[email protected]>
> ---
> drivers/net/wireless/wl12xx/wl1271_spi.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c
> index 96d25fb..4cb99c5 100644
> --- a/drivers/net/wireless/wl12xx/wl1271_spi.c
> +++ b/drivers/net/wireless/wl12xx/wl1271_spi.c
> @@ -160,9 +160,8 @@ static void wl1271_spi_init(struct wl1271 *wl)
> spi_message_add_tail(&t, &m);
>
> spi_sync(wl_to_spi(wl), &m);
> - kfree(cmd);
> -
> wl1271_dump(DEBUG_SPI, "spi init -> ", cmd, WSPI_INIT_CMD_LEN);
> + kfree(cmd);
> }
>
> #define WL1271_BUSY_WORD_TIMEOUT 1000

Whoops ;) Good catch, thanks.

Acked-by: Juuso Oikarinen <[email protected]>

-Juuso