2011-04-07 19:46:12

by Jesper Juhl

Subject: [PATCH][media] DVB, USB, lmedm04: Fix firmware mem leak in lme_firmware_switch()

Don't leak 'fw' in
drivers/media/dvb/dvb-usb/lmedm04.c::lme_firmware_switch() by failing to
call release_firmware().

Signed-off-by: Jesper Juhl <[email protected]>
---
lmedm04.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

compile tested only

diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
index cd26e7c..d7cc625 100644
--- a/drivers/media/dvb/dvb-usb/lmedm04.c
+++ b/drivers/media/dvb/dvb-usb/lmedm04.c
@@ -799,7 +799,7 @@ static int lme_firmware_switch(struct usb_device *udev, int cold)
if (cold) {
info("FRM Changing to %s firmware", fw_lme);
lme_coldreset(udev);
- return -ENODEV;
+ ret = -ENODEV;
}

release_firmware(fw);


--
Jesper Juhl <[email protected]> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.

2011-04-07 19:56:39

by Malcolm Priestley

Subject: Re: [PATCH][media] DVB, USB, lmedm04: Fix firmware mem leak in lme_firmware_switch()

On Thu, 2011-04-07 at 21:46 +0200, Jesper Juhl wrote:
> Don't leak 'fw' in
> drivers/media/dvb/dvb-usb/lmedm04.c::lme_firmware_switch() by failing to
> call release_firmware().
>
> Signed-off-by: Jesper Juhl <[email protected]>
> ---
> lmedm04.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> compile tested only
>
> diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
> index cd26e7c..d7cc625 100644
> --- a/drivers/media/dvb/dvb-usb/lmedm04.c
> +++ b/drivers/media/dvb/dvb-usb/lmedm04.c
> @@ -799,7 +799,7 @@ static int lme_firmware_switch(struct usb_device *udev, int cold)
> if (cold) {
> info("FRM Changing to %s firmware", fw_lme);
> lme_coldreset(udev);
> - return -ENODEV;
> + ret = -ENODEV;
> }
>
> release_firmware(fw);

This has already been fixed in this commit

http://git.linuxtv.org/media_tree.git?a=commit;h=b328817a2a391d1e879c4252cd3f11a352d3f3bc

2011-04-07 19:59:47

by Jesper Juhl

Subject: Re: [PATCH][media] DVB, USB, lmedm04: Fix firmware mem leak in lme_firmware_switch()

On Thu, 7 Apr 2011, Malcolm Priestley wrote:

> On Thu, 2011-04-07 at 21:46 +0200, Jesper Juhl wrote:
> > Don't leak 'fw' in
> > drivers/media/dvb/dvb-usb/lmedm04.c::lme_firmware_switch() by failing to
> > call release_firmware().
> >
> > Signed-off-by: Jesper Juhl <[email protected]>
> > ---
> > lmedm04.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > compile tested only
> >
> > diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
> > index cd26e7c..d7cc625 100644
> > --- a/drivers/media/dvb/dvb-usb/lmedm04.c
> > +++ b/drivers/media/dvb/dvb-usb/lmedm04.c
> > @@ -799,7 +799,7 @@ static int lme_firmware_switch(struct usb_device *udev, int cold)
> > if (cold) {
> > info("FRM Changing to %s firmware", fw_lme);
> > lme_coldreset(udev);
> > - return -ENODEV;
> > + ret = -ENODEV;
> > }
> >
> > release_firmware(fw);
>
> This has already been fixed in this commit
>
> http://git.linuxtv.org/media_tree.git?a=commit;h=b328817a2a391d1e879c4252cd3f11a352d3f3bc
>
I see. Thanks. I was not aware of that.

--
Jesper Juhl <[email protected]> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.