2009-07-09 00:16:45

by Ming Lei

Subject: [PATCH] driver core:firmware_class:fix memory leak of page pointers array

From: Ming Lei <[email protected]>

The page pointers array is allocated in fw_realloc_buffer() called by
firmware_data_write(), and should be freed in release function of firmware
device.

Signed-off-by:Ming Lei <[email protected]>
Reported-by:Catalin Marinas <[email protected]>
Acked-by: David Woodhouse <[email protected]>
---
drivers/base/firmware_class.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index fc46653..2643366 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -180,7 +180,6 @@ static ssize_t firmware_loading_store(struct device *dev,
goto err;
}
/* Pages will be freed by vfree() */
- fw_priv->pages = NULL;
fw_priv->page_array_size = 0;
fw_priv->nr_pages = 0;
complete(&fw_priv->completion);
--
1.6.0.GIT

2009-07-09 00:20:57

by Ming Lei

Subject: Re: [PATCH] driver core:firmware_class:fix memory leak of page pointers array

2009/7/9 <[email protected]>:
> From: Ming Lei <[email protected]>
>
> The page pointers array is allocated in fw_realloc_buffer() called by
> firmware_data_write(), and should be freed in release function of firmware
> device.
>
> Signed-off-by:Ming Lei <[email protected]>
> Reported-by:Catalin Marinas <[email protected]>
> Acked-by: David Woodhouse <[email protected]>

---
This patch is against Catalin Marinas's patch:
[PATCH] Free struct device in fw_dev_release()

> ---
> ?drivers/base/firmware_class.c | ? ?1 -
> ?1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index fc46653..2643366 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -180,7 +180,6 @@ static ssize_t firmware_loading_store(struct device *dev,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?goto err;
> ? ? ? ? ? ? ? ? ? ? ? ?}
> ? ? ? ? ? ? ? ? ? ? ? ?/* Pages will be freed by vfree() */
> - ? ? ? ? ? ? ? ? ? ? ? fw_priv->pages = NULL;
> ? ? ? ? ? ? ? ? ? ? ? ?fw_priv->page_array_size = 0;
> ? ? ? ? ? ? ? ? ? ? ? ?fw_priv->nr_pages = 0;
> ? ? ? ? ? ? ? ? ? ? ? ?complete(&fw_priv->completion);
> --
> 1.6.0.GIT
>
>



--
Lei Ming

2009-07-10 17:37:38

by Greg KH

Subject: Re: [PATCH] driver core:firmware_class:fix memory leak of page pointers array

On Thu, Jul 09, 2009 at 08:20:48AM +0800, Ming Lei wrote:
> 2009/7/9 <[email protected]>:
> > From: Ming Lei <[email protected]>
> >
> > The page pointers array is allocated in fw_realloc_buffer() called by
> > firmware_data_write(), and should be freed in release function of firmware
> > device.
> >
> > Signed-off-by:Ming Lei <[email protected]>
> > Reported-by:Catalin Marinas <[email protected]>
> > Acked-by: David Woodhouse <[email protected]>
>
> ---
> This patch is against Catalin Marinas's patch:
> [PATCH] Free struct device in fw_dev_release()

Hm, I never got a final version of that patch, care to send it to me?

thanks,

greg k-h

2009-07-11 03:11:33

by Ming Lei

Subject: Re: [PATCH] driver core:firmware_class:fix memory leak of page pointers array

?? Fri, 10 Jul 2009 10:36:49 -0700
Greg KH <[email protected]> д??:

> On Thu, Jul 09, 2009 at 08:20:48AM +0800, Ming Lei wrote:
> > 2009/7/9 <[email protected]>:
> > > From: Ming Lei <[email protected]>
> > >
> > > The page pointers array is allocated in fw_realloc_buffer()
> > > called by firmware_data_write(), and should be freed in release
> > > function of firmware device.
> > >
> > > Signed-off-by:Ming Lei <[email protected]>
> > > Reported-by:Catalin Marinas <[email protected]>
> > > Acked-by: David Woodhouse <[email protected]>
> >
> > ---
> > This patch is against Catalin Marinas's patch:
> > [PATCH] Free struct device in fw_dev_release()
>
> Hm, I never got a final version of that patch, care to send it to me?

It is the latest version and now is against linus mainline.
Thanks.

>From 50603673f5c68eb843584e65cc9930919910f98a Mon Sep 17 00:00:00 2001
From: Ming Lei <[email protected]>
Date: Thu, 9 Jul 2009 07:56:52 +0800
Subject: [PATCH] driver core:firmware_class:fix memory leak of page pointers array

The page pointers array is allocated in fw_realloc_buffer() called by
firmware_data_write(), and should be freed in release function of firmware
device.

Signed-off-by:Ming Lei <[email protected]>
Reported-by:Catalin Marinas <[email protected]>
Acked-by: David Woodhouse <[email protected]>
---
drivers/base/firmware_class.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index fc46653..2643366 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -180,7 +180,6 @@ static ssize_t firmware_loading_store(struct device *dev,
goto err;
}
/* Pages will be freed by vfree() */
- fw_priv->pages = NULL;
fw_priv->page_array_size = 0;
fw_priv->nr_pages = 0;
complete(&fw_priv->completion);
--
1.6.0.GIT





--
Lei Ming

2009-07-16 13:22:35

by Ming Lei

Subject: Re: [PATCH] driver core:firmware_class:fix memory leak of page pointers array

2009/7/11 Ming Lei <[email protected]>:
> On Fri, 10 Jul 2009 10:36:49 -0700
> Greg KH <[email protected]> wrote:
>
>> On Thu, Jul 09, 2009 at 08:20:48AM +0800, Ming Lei wrote:
>> > 2009/7/9 ?<[email protected]>:
>> > > From: Ming Lei <[email protected]>
>> > >
>> > > The page pointers array is allocated in fw_realloc_buffer()
>> > > called by firmware_data_write(), and should be freed in release
>> > > function of firmware device.
>> > >
>> > > Signed-off-by:Ming Lei <[email protected]>
>> > > Reported-by:Catalin Marinas <[email protected]>
>> > > Acked-by: David Woodhouse <[email protected]>
>> >
>> > ---
>> > This patch is against Catalin Marinas's patch:
>> > ? ? [PATCH] Free struct device in fw_dev_release()
>>
>> Hm, I never got a final version of that patch, care to send it to me?

Hi,Greg

Care to queue the patch into your driver-core tree and send it to -rc4?
Thanks.

>
> It is the latest version and now is against linus mainline.
> Thanks.
>
> From 50603673f5c68eb843584e65cc9930919910f98a Mon Sep 17 00:00:00 2001
> From: Ming Lei <[email protected]>
> Date: Thu, 9 Jul 2009 07:56:52 +0800
> Subject: [PATCH] driver core:firmware_class:fix memory leak of page pointers array
>
> The page pointers array is allocated in fw_realloc_buffer() called by
> firmware_data_write(), and should be freed in release function of firmware
> device.
>
> Signed-off-by:Ming Lei <[email protected]>
> Reported-by:Catalin Marinas <[email protected]>
> Acked-by: David Woodhouse <[email protected]>
> ---
> ?drivers/base/firmware_class.c | ? ?1 -
> ?1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index fc46653..2643366 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -180,7 +180,6 @@ static ssize_t firmware_loading_store(struct device *dev,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?goto err;
> ? ? ? ? ? ? ? ? ? ? ? ?}
> ? ? ? ? ? ? ? ? ? ? ? ?/* Pages will be freed by vfree() */
> - ? ? ? ? ? ? ? ? ? ? ? fw_priv->pages = NULL;
> ? ? ? ? ? ? ? ? ? ? ? ?fw_priv->page_array_size = 0;
> ? ? ? ? ? ? ? ? ? ? ? ?fw_priv->nr_pages = 0;
> ? ? ? ? ? ? ? ? ? ? ? ?complete(&fw_priv->completion);
> --
> 1.6.0.GIT
>
>
>
>
>
> --
> Lei Ming
>



--
Lei Ming

2009-07-16 22:47:39

by Greg KH

Subject: Re: [PATCH] driver core:firmware_class:fix memory leak of page pointers array

On Thu, Jul 16, 2009 at 09:22:33PM +0800, Ming Lei wrote:
> 2009/7/11 Ming Lei <[email protected]>:
> > On Fri, 10 Jul 2009 10:36:49 -0700
> > Greg KH <[email protected]> wrote:
> >
> >> On Thu, Jul 09, 2009 at 08:20:48AM +0800, Ming Lei wrote:
> >> > 2009/7/9 ?<[email protected]>:
> >> > > From: Ming Lei <[email protected]>
> >> > >
> >> > > The page pointers array is allocated in fw_realloc_buffer()
> >> > > called by firmware_data_write(), and should be freed in release
> >> > > function of firmware device.
> >> > >
> >> > > Signed-off-by:Ming Lei <[email protected]>
> >> > > Reported-by:Catalin Marinas <[email protected]>
> >> > > Acked-by: David Woodhouse <[email protected]>
> >> >
> >> > ---
> >> > This patch is against Catalin Marinas's patch:
> >> > ? ? [PATCH] Free struct device in fw_dev_release()
> >>
> >> Hm, I never got a final version of that patch, care to send it to me?
>
> Hi,Greg
>
> Care to queue the patch into your driver-core tree and send it to -rc4?

Now queued up.

thanks,

greg k-h