2010-11-24 16:00:54

by Daniel Drake

Subject: [PATCH 1/2] libertas: fix memory corruption in lbs_remove_card()

"priv" is stored at the end of the wiphy structure, which is freed
during the call to lbs_cfg_free(). It must not be touched afterwards.

Remove the unnecessary NULL assignment causing this memory corruption.

Signed-off-by: Daniel Drake <[email protected]>
---
drivers/net/wireless/libertas/main.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

Please apply for 2.6.37

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 46b88b1..fcd1bbf 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -915,8 +915,6 @@ void lbs_remove_card(struct lbs_private *priv)

lbs_free_adapter(priv);
lbs_cfg_free(priv);
-
- priv->dev = NULL;
free_netdev(dev);

lbs_deb_leave(LBS_DEB_MAIN);
--
1.7.3.2

2010-12-02 16:39:06

by Dan Williams

Subject: Re: [PATCH 1/2] libertas: fix memory corruption in lbs_remove_card()

On Wed, 2010-11-24 at 16:00 +0000, Daniel Drake wrote:
> "priv" is stored at the end of the wiphy structure, which is freed
> during the call to lbs_cfg_free(). It must not be touched afterwards.
>
> Remove the unnecessary NULL assignment causing this memory corruption.
>
> Signed-off-by: Daniel Drake <[email protected]>

Acked-by: Dan Williams <[email protected]>

> ---
> drivers/net/wireless/libertas/main.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> Please apply for 2.6.37
>
> diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
> index 46b88b1..fcd1bbf 100644
> --- a/drivers/net/wireless/libertas/main.c
> +++ b/drivers/net/wireless/libertas/main.c
> @@ -915,8 +915,6 @@ void lbs_remove_card(struct lbs_private *priv)
>
> lbs_free_adapter(priv);
> lbs_cfg_free(priv);
> -
> - priv->dev = NULL;
> free_netdev(dev);
>
> lbs_deb_leave(LBS_DEB_MAIN);