linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.
@ 2006-10-09  6:10 Amit Choudhary
  2006-10-09  8:34 ` Manu Abraham
  2006-10-09  8:37 ` Olaf Hering
  0 siblings, 2 replies; 7+ messages in thread
From: Amit Choudhary @ 2006-10-09  6:10 UTC (permalink / raw)
  To: Linux Kernel

Description: Check the return value of kmalloc() in function frontend_init(), in file drivers/media/dvb/bt8xx/dvb-bt8xx.c.

Signed-off-by: Amit Choudhary <amit2030@gmail.com>

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index fb6c4cc..14e69a7 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -665,6 +665,10 @@ 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) {
+			printk("dvb_bt8xx: No memory\n");
+			break;
+		}
 		/*	Setup the Card					*/
 		state->config = &dst_config;
 		state->i2c = card->i2c_adapter;

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.
  2006-10-09  6:10 [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value Amit Choudhary
@ 2006-10-09  8:34 ` Manu Abraham
  2006-10-10  8:01   ` [stable] " Greg KH
  2006-10-09  8:37 ` Olaf Hering
  1 sibling, 1 reply; 7+ messages in thread
From: Manu Abraham @ 2006-10-09  8:34 UTC (permalink / raw)
  To: Amit Choudhary; +Cc: Linux Kernel, stable, v4l-dvb maintainer list

Amit Choudhary wrote:
> Description: Check the return value of kmalloc() in function frontend_init(), in file drivers/media/dvb/bt8xx/dvb-bt8xx.c.
> 
> Signed-off-by: Amit Choudhary <amit2030@gmail.com>
> 
> diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> index fb6c4cc..14e69a7 100644
> --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> @@ -665,6 +665,10 @@ 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) {
> +			printk("dvb_bt8xx: No memory\n");
> +			break;
> +		}
>  		/*	Setup the Card					*/
>  		state->config = &dst_config;
>  		state->i2c = card->i2c_adapter;
> -


Signed-off-by: Manu Abraham <manu@linuxtv.org>



Thanks,
Manu

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.
  2006-10-09  6:10 [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value Amit Choudhary
  2006-10-09  8:34 ` Manu Abraham
@ 2006-10-09  8:37 ` Olaf Hering
  2006-10-09  8:44   ` Manu Abraham
  1 sibling, 1 reply; 7+ messages in thread
From: Olaf Hering @ 2006-10-09  8:37 UTC (permalink / raw)
  To: Amit Choudhary; +Cc: Linux Kernel

On Sun, Oct 08, Amit Choudhary wrote:

> Description: Check the return value of kmalloc() in function frontend_init(), in file drivers/media/dvb/bt8xx/dvb-bt8xx.c.
> 
> Signed-off-by: Amit Choudhary <amit2030@gmail.com>
> 
> diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> index fb6c4cc..14e69a7 100644
> --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> @@ -665,6 +665,10 @@ 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) {
> +			printk("dvb_bt8xx: No memory\n");

KERN_FOO loglevel is missing.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.
  2006-10-09  8:37 ` Olaf Hering
@ 2006-10-09  8:44   ` Manu Abraham
  0 siblings, 0 replies; 7+ messages in thread
From: Manu Abraham @ 2006-10-09  8:44 UTC (permalink / raw)
  To: Olaf Hering; +Cc: Amit Choudhary, Linux Kernel

Olaf Hering wrote:
> On Sun, Oct 08, Amit Choudhary wrote:
> 
>> Description: Check the return value of kmalloc() in function frontend_init(), in file drivers/media/dvb/bt8xx/dvb-bt8xx.c.
>>
>> Signed-off-by: Amit Choudhary <amit2030@gmail.com>
>>
>> diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
>> index fb6c4cc..14e69a7 100644
>> --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
>> +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
>> @@ -665,6 +665,10 @@ 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) {
>> +			printk("dvb_bt8xx: No memory\n");
> 
> KERN_FOO loglevel is missing.

It shouldn't matter though.


Manu



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [stable] [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.
  2006-10-09  8:34 ` Manu Abraham
@ 2006-10-10  8:01   ` Greg KH
  2006-10-10 11:18     ` Manu Abraham
  0 siblings, 1 reply; 7+ messages in thread
From: Greg KH @ 2006-10-10  8:01 UTC (permalink / raw)
  To: Manu Abraham
  Cc: Amit Choudhary, v4l-dvb maintainer list, Linux Kernel, stable

On Mon, Oct 09, 2006 at 12:34:41PM +0400, Manu Abraham wrote:
> Amit Choudhary wrote:
> > Description: Check the return value of kmalloc() in function frontend_init(), in file drivers/media/dvb/bt8xx/dvb-bt8xx.c.
> > 
> > Signed-off-by: Amit Choudhary <amit2030@gmail.com>
> > 
> > diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> > index fb6c4cc..14e69a7 100644
> > --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> > +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> > @@ -665,6 +665,10 @@ 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) {
> > +			printk("dvb_bt8xx: No memory\n");
> > +			break;
> > +		}
> >  		/*	Setup the Card					*/
> >  		state->config = &dst_config;
> >  		state->i2c = card->i2c_adapter;
> > -
> 
> 
> Signed-off-by: Manu Abraham <manu@linuxtv.org>

Care to send the full patch in a format that we can apply it to the
-stable tree?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [stable] [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.
  2006-10-10  8:01   ` [stable] " Greg KH
@ 2006-10-10 11:18     ` Manu Abraham
  2006-10-10 16:31       ` Greg KH
  0 siblings, 1 reply; 7+ messages in thread
From: Manu Abraham @ 2006-10-10 11:18 UTC (permalink / raw)
  To: Greg KH; +Cc: Amit Choudhary, v4l-dvb maintainer list, Linux Kernel, stable

[-- Attachment #1: Type: text/plain, Size: 1165 bytes --]

Greg KH wrote:
> On Mon, Oct 09, 2006 at 12:34:41PM +0400, Manu Abraham wrote:
>> Amit Choudhary wrote:
>>> Description: Check the return value of kmalloc() in function frontend_init(), in file drivers/media/dvb/bt8xx/dvb-bt8xx.c.
>>>
>>> Signed-off-by: Amit Choudhary <amit2030@gmail.com>
>>>
>>> diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
>>> index fb6c4cc..14e69a7 100644
>>> --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
>>> +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
>>> @@ -665,6 +665,10 @@ 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) {
>>> +			printk("dvb_bt8xx: No memory\n");
>>> +			break;
>>> +		}
>>>  		/*	Setup the Card					*/
>>>  		state->config = &dst_config;
>>>  		state->i2c = card->i2c_adapter;
>>> -
>>
>> Signed-off-by: Manu Abraham <manu@linuxtv.org>
> 
> Care to send the full patch in a format that we can apply it to the
> -stable tree?
> 


 dvb-bt8xx.c |    4 ++++
 1 files changed, 4 insertions(+)


Thanks,

Manu

[-- Attachment #2: dvb_check_mem_allocation.patch --]
[-- Type: text/x-patch, Size: 689 bytes --]

diff -Naurp linux-2.6.18.orig/drivers/media/dvb/bt8xx/dvb-bt8xx.c linux-2.6.18/drivers/media/dvb/bt8xx/dvb-bt8xx.c
--- linux-2.6.18.orig/drivers/media/dvb/bt8xx/dvb-bt8xx.c	2006-09-20 07:42:06.000000000 +0400
+++ linux-2.6.18/drivers/media/dvb/bt8xx/dvb-bt8xx.c	2006-10-10 15:02:28.000000000 +0400
@@ -666,6 +666,10 @@ 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) {
+			printk("%s: Out of Memory !\n", __func__);
+			break;
+		}
 		/*	Setup the Card					*/
 		state->config = &dst_config;
 		state->i2c = card->i2c_adapter;

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [stable] [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.
  2006-10-10 11:18     ` Manu Abraham
@ 2006-10-10 16:31       ` Greg KH
  0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2006-10-10 16:31 UTC (permalink / raw)
  To: Manu Abraham
  Cc: Amit Choudhary, v4l-dvb maintainer list, Linux Kernel, stable

On Tue, Oct 10, 2006 at 03:18:58PM +0400, Manu Abraham wrote:
> Greg KH wrote:
> > On Mon, Oct 09, 2006 at 12:34:41PM +0400, Manu Abraham wrote:
> >> Amit Choudhary wrote:
> >>> Description: Check the return value of kmalloc() in function frontend_init(), in file drivers/media/dvb/bt8xx/dvb-bt8xx.c.
> >>>
> >>> Signed-off-by: Amit Choudhary <amit2030@gmail.com>
> >>>
> >>> diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> >>> index fb6c4cc..14e69a7 100644
> >>> --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> >>> +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
> >>> @@ -665,6 +665,10 @@ 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) {
> >>> +			printk("dvb_bt8xx: No memory\n");
> >>> +			break;
> >>> +		}
> >>>  		/*	Setup the Card					*/
> >>>  		state->config = &dst_config;
> >>>  		state->i2c = card->i2c_adapter;
> >>> -
> >>
> >> Signed-off-by: Manu Abraham <manu@linuxtv.org>
> > 
> > Care to send the full patch in a format that we can apply it to the
> > -stable tree?
> > 
> 
> 
>  dvb-bt8xx.c |    4 ++++
>  1 files changed, 4 insertions(+)
> 
> 
> Thanks,

Um, can you resend it with the proper description and signed-off-by:
lines so that it can be applied correctly?

And does this solve a real bug, or is it just added error condition
checks?  If the latter, I don't think it's ok for -stable right now.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2006-10-10 16:45 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-10-09  6:10 [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value Amit Choudhary
2006-10-09  8:34 ` Manu Abraham
2006-10-10  8:01   ` [stable] " Greg KH
2006-10-10 11:18     ` Manu Abraham
2006-10-10 16:31       ` Greg KH
2006-10-09  8:37 ` Olaf Hering
2006-10-09  8:44   ` Manu Abraham

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).