[PATCH] V4L/DVB: potential leak in dvb-bt8xx

[PATCH] V4L/DVB: potential leak in dvb-bt8xx

[Florin Malita]

If dvb_attach
<http://www.coverity.com:7448/display-error.cgi?user=fmalita&magic=8997c91336813f372812011c89e0e75e&source=2693a21be69533084392e43c4f3c5220&runid=86&table=file&line=107>(dst_attach,
...) fails in *frontend_init*(), the previously allocated 'state' is
leaked (Coverity ID 1437).

Also, when allocating 'state' the result of kmalloc() needs to be checked.

Signed-off-by: Florin Malita <fmalita@gmail.com>
---

 drivers/media/dvb/bt8xx/dvb-bt8xx.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index fb6c4cc..d22ba4e 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -665,6 +665,9 @@ static void frontend_init(struct dvb_bt8
 	case BTTV_BOARD_TWINHAN_DST:
 		/*	DST is not a frontend driver !!!		*/
 		state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL);
+		if (!state)
+			break;
+
 		/*	Setup the Card					*/
 		state->config = &dst_config;
 		state->i2c = card->i2c_adapter;
@@ -673,6 +676,7 @@ static void frontend_init(struct dvb_bt8
 		/*	DST is not a frontend, attaching the ASIC	*/
 		if (dvb_attach(dst_attach, state, &card->dvb_adapter) == NULL) {
 			printk("%s: Could not find a Twinhan DST.\n", __FUNCTION__);
+			kfree(state);
 			break;
 		}
 		/*	Attach other DST peripherals if any		*/

Re: [v4l-dvb-maintainer] [PATCH] V4L/DVB: potential leak in dvb-bt8xx

[Trent Piepho]

On Sat, 14 Oct 2006, Florin Malita wrote:
> If dvb_attach
> <http://www.coverity.com:7448/display-error.cgi?user=fmalita&magic=8997c91336813f372812011c89e0e75e&source=2693a21be69533084392e43c4f3c5220&runid=86&table=file&line=107>(dst_attach,
> ...) fails in *frontend_init*(), the previously allocated 'state' is
> leaked (Coverity ID 1437).

I believe that 'state' will be kfree'd by the dst_attach() function if there
is a failure.  Not what you would expect, to have it allocated in the bt8xx
driver (why do is there??) and freed on error in a different function.

You know, I had a patch to fix all these dst problems two months ago....

>
> Also, when allocating 'state' the result of kmalloc() needs to be checked.
>
> Signed-off-by: Florin Malita <fmalita@gmail.com>
> ---
>
>  drivers/media/dvb/bt8xx/dvb-bt8xx.c |    4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> index fb6c4cc..d22ba4e 100644
> --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> @@ -665,6 +665,9 @@ static void frontend_init(struct dvb_bt8
>  	case BTTV_BOARD_TWINHAN_DST:
>  		/*	DST is not a frontend driver !!!		*/
>  		state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL);
> +		if (!state)
> +			break;
> +
>  		/*	Setup the Card					*/
>  		state->config = &dst_config;
>  		state->i2c = card->i2c_adapter;
> @@ -673,6 +676,7 @@ static void frontend_init(struct dvb_bt8
>  		/*	DST is not a frontend, attaching the ASIC	*/
>  		if (dvb_attach(dst_attach, state, &card->dvb_adapter) == NULL) {
>  			printk("%s: Could not find a Twinhan DST.\n", __FUNCTION__);
> +			kfree(state);
>  			break;
>  		}
>  		/*	Attach other DST peripherals if any		*/
>
>
>
> _______________________________________________
> v4l-dvb-maintainer mailing list
> v4l-dvb-maintainer@linuxtv.org
> http://www.linuxtv.org/cgi-bin/mailman/listinfo/v4l-dvb-maintainer
>

Re: [v4l-dvb-maintainer] [PATCH] V4L/DVB: potential leak in dvb-bt8xx

[Florin Malita]

Trent Piepho wrote:
> I believe that 'state' will be kfree'd by the dst_attach() function if there
> is a failure.  Not what you would expect, to have it allocated in the bt8xx
> driver (why do is there??) and freed on error in a different function.
>   

Hm, you're right - it is kfreed in dst_attach(). But we're still missing
the kmalloc result check...

Signed-off-by: Florin Malita <fmalita@gmail.com>
---

 dvb-bt8xx.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index fb6c4cc..d22ba4e 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -665,6 +665,9 @@ static void frontend_init(struct dvb_bt8
 	case BTTV_BOARD_TWINHAN_DST:
 		/*	DST is not a frontend driver !!!		*/
 		state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL);
+		if (!state)
+			break;
+
 		/*	Setup the Card					*/
 		state->config = &dst_config;
 		state->i2c = card->i2c_adapter;

Re: [v4l-dvb-maintainer] [PATCH] V4L/DVB: potential leak in dvb-bt8xx

[Manu Abraham]

Florin Malita wrote:
> Trent Piepho wrote:
>> I believe that 'state' will be kfree'd by the dst_attach() function if there
>> is a failure.  Not what you would expect, to have it allocated in the bt8xx
>> driver (why do is there??) and freed on error in a different function.
>>   
> 
> Hm, you're right - it is kfreed in dst_attach(). But we're still missing
> the kmalloc result check...
> 
> Signed-off-by: Florin Malita <fmalita@gmail.com>
> ---
> 
>  dvb-bt8xx.c |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> index fb6c4cc..d22ba4e 100644
> --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> @@ -665,6 +665,9 @@ static void frontend_init(struct dvb_bt8
>  	case BTTV_BOARD_TWINHAN_DST:
>  		/*	DST is not a frontend driver !!!		*/
>  		state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL);
> +		if (!state)
> +			break;
> +
>  		/*	Setup the Card					*/
>  		state->config = &dst_config;
>  		state->i2c = card->i2c_adapter;
> 



This patch was applied a few days back

Manu

Re: [v4l-dvb-maintainer] [PATCH] V4L/DVB: potential leak in dvb-bt8xx

[Mauro Carvalho Chehab]

Em Dom, 2006-10-15 às 20:35 +0400, Manu Abraham escreveu:
> Florin Malita wrote:
> > Trent Piepho wrote:
> >> I believe that 'state' will be kfree'd by the dst_attach() function if there
> >> is a failure.  Not what you would expect, to have it allocated in the bt8xx
> >> driver (why do is there??) and freed on error in a different function.
> >>   
> > 
> > Hm, you're right - it is kfreed in dst_attach(). But we're still missing
> > the kmalloc result check...
> > 
> 
> This patch was applied a few days back

Yes. 

It is at:
http://www.kernel.org/git/?p=linux/kernel/git/mchehab/v4l-dvb.git;a=commit;h=626ae83bb24927ca015503448f0199842ae2e8da

I've already asked Linus to pull it, together with other 17 fixes, to
Mainstream.
> 
> Manu
Cheers, 
Mauro.

Re: [v4l-dvb-maintainer] [PATCH] V4L/DVB: potential leak in dvb-bt8xx

[Manu Abraham]

Mauro Carvalho Chehab wrote:
> Em Dom, 2006-10-15 às 20:35 +0400, Manu Abraham escreveu:
>> Florin Malita wrote:
>>> Trent Piepho wrote:
>>>> I believe that 'state' will be kfree'd by the dst_attach() function if there
>>>> is a failure.  Not what you would expect, to have it allocated in the bt8xx
>>>> driver (why do is there??) and freed on error in a different function.
>>>>   
>>> Hm, you're right - it is kfreed in dst_attach(). But we're still missing
>>> the kmalloc result check...
>>>
>> This patch was applied a few days back
> 
> Yes. 
> 
> It is at:
> http://www.kernel.org/git/?p=linux/kernel/git/mchehab/v4l-dvb.git;a=commit;h=626ae83bb24927ca015503448f0199842ae2e8da

Ok.

> 
> I've already asked Linus to pull it, together with other 17 fixes, to
> Mainstream.
>> Manu
> Cheers, 
> Mauro.


Thanks,
Manu