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

Manu Abraham
2006-10-10T11:19:13Z

[-- 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;