* [PATCH] fbdev: broadsheetfb: fix memory leak
@ 2015-09-18 11:28 Sudip Mukherjee
2015-09-24 10:12 ` Tomi Valkeinen
0 siblings, 1 reply; 3+ messages in thread
From: Sudip Mukherjee @ 2015-09-18 11:28 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: linux-kernel, linux-fbdev, Sudip Mukherjee
On the error path we have missed releasing the firmware.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
drivers/video/fbdev/broadsheetfb.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c
index 0e5fde1..ac1f41e 100644
--- a/drivers/video/fbdev/broadsheetfb.c
+++ b/drivers/video/fbdev/broadsheetfb.c
@@ -752,7 +752,7 @@ static ssize_t broadsheet_loadstore_waveform(struct device *dev,
if ((fw_entry->size < 8*1024) || (fw_entry->size > 64*1024)) {
dev_err(dev, "Invalid waveform\n");
err = -EINVAL;
- goto err_failed;
+ goto err_fw;
}
mutex_lock(&(par->io_lock));
@@ -762,13 +762,15 @@ static ssize_t broadsheet_loadstore_waveform(struct device *dev,
mutex_unlock(&(par->io_lock));
if (err < 0) {
dev_err(dev, "Failed to store broadsheet waveform\n");
- goto err_failed;
+ goto err_fw;
}
dev_info(dev, "Stored broadsheet waveform, size %zd\n", fw_entry->size);
return len;
+err_fw:
+ release_firmware(fw_entry);
err_failed:
return err;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] fbdev: broadsheetfb: fix memory leak
2015-09-18 11:28 [PATCH] fbdev: broadsheetfb: fix memory leak Sudip Mukherjee
@ 2015-09-24 10:12 ` Tomi Valkeinen
2015-09-25 13:56 ` Sudip Mukherjee
0 siblings, 1 reply; 3+ messages in thread
From: Tomi Valkeinen @ 2015-09-24 10:12 UTC (permalink / raw)
To: Sudip Mukherjee, Jean-Christophe Plagniol-Villard
Cc: linux-kernel, linux-fbdev
[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]
On 18/09/15 14:16, Sudip Mukherjee wrote:
> On the error path we have missed releasing the firmware.
>
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---
> drivers/video/fbdev/broadsheetfb.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c
> index 0e5fde1..ac1f41e 100644
> --- a/drivers/video/fbdev/broadsheetfb.c
> +++ b/drivers/video/fbdev/broadsheetfb.c
> @@ -752,7 +752,7 @@ static ssize_t broadsheet_loadstore_waveform(struct device *dev,
> if ((fw_entry->size < 8*1024) || (fw_entry->size > 64*1024)) {
> dev_err(dev, "Invalid waveform\n");
> err = -EINVAL;
> - goto err_failed;
> + goto err_fw;
> }
>
> mutex_lock(&(par->io_lock));
> @@ -762,13 +762,15 @@ static ssize_t broadsheet_loadstore_waveform(struct device *dev,
> mutex_unlock(&(par->io_lock));
> if (err < 0) {
> dev_err(dev, "Failed to store broadsheet waveform\n");
> - goto err_failed;
> + goto err_fw;
> }
>
> dev_info(dev, "Stored broadsheet waveform, size %zd\n", fw_entry->size);
>
> return len;
>
> +err_fw:
> + release_firmware(fw_entry);
> err_failed:
> return err;
> }
This looks like correct fix, but where is the firmware released when
there is no error?
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] fbdev: broadsheetfb: fix memory leak
2015-09-24 10:12 ` Tomi Valkeinen
@ 2015-09-25 13:56 ` Sudip Mukherjee
0 siblings, 0 replies; 3+ messages in thread
From: Sudip Mukherjee @ 2015-09-25 13:56 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Jean-Christophe Plagniol-Villard, linux-kernel, linux-fbdev
On Thu, Sep 24, 2015 at 01:12:48PM +0300, Tomi Valkeinen wrote:
>
> On 18/09/15 14:16, Sudip Mukherjee wrote:
> > On the error path we have missed releasing the firmware.
> >
> > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> > ---
<snip>
>
> This looks like correct fix, but where is the firmware released when
> there is no error?
I will send v2. Usually all the memleaks will be in the error path so I
concentrate on that part. Sorry, should have looked fully.
regards
sudip
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-09-25 13:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-18 11:28 [PATCH] fbdev: broadsheetfb: fix memory leak Sudip Mukherjee
2015-09-24 10:12 ` Tomi Valkeinen
2015-09-25 13:56 ` Sudip Mukherjee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).