[patch] [media] cx18: check for allocation failure in cx18_read_eeprom()

[patch] [media] cx18: check for allocation failure in cx18_read_eeprom()

[Dan Carpenter]

It upsets static checkers when we don't check for allocation failure.  I
moved the memset() of "tv" earlier so we don't use uninitialized data on
error.

Fixes: 1d212cf0c2d8 ('[media] cx18: struct i2c_client is too big for stack')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index c1f8cc6f14b2..716bdc57fac6 100644
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -327,13 +327,16 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
 	struct i2c_client *c;
 	u8 eedata[256];
 
+	memset(tv, 0, sizeof(*tv));
+
 	c = kzalloc(sizeof(*c), GFP_KERNEL);
+	if (!c)
+		return;
 
 	strlcpy(c->name, "cx18 tveeprom tmp", sizeof(c->name));
 	c->adapter = &cx->i2c_adap[0];
 	c->addr = 0xa0 >> 1;
 
-	memset(tv, 0, sizeof(*tv));
 	if (tveeprom_read(c, eedata, sizeof(eedata)))
 		goto ret;
 

Re: [patch] [media] cx18: check for allocation failure in cx18_read_eeprom()

[Dan Carpenter]

Btw, the MAINTAINERS file says the ivtv list is moderated but actually
it's a subscriber only list...  Sucks.

regards,
dan carpenter

Re: [patch] [media] cx18: check for allocation failure in cx18_read_eeprom()

[Hans Verkuil]

Andy,

Should we perhaps change the MAINTAINERS file to point to the linux-media list
instead?

Regards,

	Hans

On 11/22/2013 10:13 AM, Dan Carpenter wrote:
> Btw, the MAINTAINERS file says the ivtv list is moderated but actually
> it's a subscriber only list...  Sucks.

Re: [patch] [media] cx18: check for allocation failure in cx18_read_eeprom()

[Andy Walls]

On Fri, 2013-11-22 at 10:21 +0100, Hans Verkuil wrote:
> Andy,
> 
> Should we perhaps change the MAINTAINERS file to point to the linux-media list
> instead?

Yes.  When I get time this weekend, I can submit a patch; unless you
beat me to it.

Regards,
Andy

> Regards,
> 
> 	Hans
> 
> On 11/22/2013 10:13 AM, Dan Carpenter wrote:
> > Btw, the MAINTAINERS file says the ivtv list is moderated but actually
> > it's a subscriber only list...  Sucks.
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch] [media] cx18: check for allocation failure in cx18_read_eeprom()

[Andy Walls]

On Fri, 2013-11-22 at 10:51 +0300, Dan Carpenter wrote:
> It upsets static checkers when we don't check for allocation failure.  I
> moved the memset() of "tv" earlier so we don't use uninitialized data on
> error.
> 
> Fixes: 1d212cf0c2d8 ('[media] cx18: struct i2c_client is too big for stack')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Andy Walls <awalls@md.metrocast.net>


> diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
> index c1f8cc6f14b2..716bdc57fac6 100644
> --- a/drivers/media/pci/cx18/cx18-driver.c
> +++ b/drivers/media/pci/cx18/cx18-driver.c
> @@ -327,13 +327,16 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
>  	struct i2c_client *c;
>  	u8 eedata[256];
>  
> +	memset(tv, 0, sizeof(*tv));
> +
>  	c = kzalloc(sizeof(*c), GFP_KERNEL);
> +	if (!c)
> +		return;
>  
>  	strlcpy(c->name, "cx18 tveeprom tmp", sizeof(c->name));
>  	c->adapter = &cx->i2c_adap[0];
>  	c->addr = 0xa0 >> 1;
>  
> -	memset(tv, 0, sizeof(*tv));
>  	if (tveeprom_read(c, eedata, sizeof(eedata)))
>  		goto ret;
>  
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html