2006-10-09 06:10:42

by Amit Choudhary

[permalink] [raw]

Subject: [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.

---

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 <[email protected]>

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;

2006-10-09 08:34:48

by Manu Abraham

[permalink] [raw]

Subject: Re: [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.

---

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 <[email protected]>
>
> 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 <[email protected]>



Thanks,
Manu

2006-10-09 08:37:26

by Olaf Hering

[permalink] [raw]

Subject: Re: [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.

---

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 <[email protected]>
>
> 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.

2006-10-09 08:44:56

by Manu Abraham

[permalink] [raw]

Subject: Re: [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.

---

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 <[email protected]>
>>
>> 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

2006-10-10 08:10:53

by Greg KH

[permalink] [raw]

Subject: Re: [stable] [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.

---

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 <[email protected]>
> >
> > 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 <[email protected]>

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

thanks,

greg k-h

2006-10-10 11:19:13

by Manu Abraham

[permalink] [raw]

Subject: Re: [stable] [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.

---

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 <[email protected]>
>>>
>>> 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 <[email protected]>
>
> 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

---

Attachments:

dvb_check_mem_allocation.patch (689.00 B)

2006-10-10 16:45:43

by Greg KH

[permalink] [raw]

Subject: Re: [stable] [PATCH 2.6.19-rc1] drivers/media/dvb/bt8xx/dvb-bt8xx.c: check kmalloc() return value.

---

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 <[email protected]>
> >>>
> >>> 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 <[email protected]>
> >
> > 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