summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-09-18 20:33:27 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-19 00:53:30 -0300
commitd8370f7eff14ef646ba4a81eb9642800518a7324 (patch)
tree6196ca523261e6e08821e8b0d3c630c10a52ee93 /drivers/media/video
parent8d04df4997b530d978d48a66655a99714af197ca (diff)
downloadkernel-crypto-d8370f7eff14ef646ba4a81eb9642800518a7324.tar.gz
kernel-crypto-d8370f7eff14ef646ba4a81eb9642800518a7324.tar.xz
kernel-crypto-d8370f7eff14ef646ba4a81eb9642800518a7324.zip
V4L/DVB (13017): gspca: kmalloc failure ignored in sd_start()
Prevent NULL dereference if kmalloc() fails. Cc: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/gspca/jeilinj.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c
index dbfa3ed6e8e..a11c97ebeb0 100644
--- a/drivers/media/video/gspca/jeilinj.c
+++ b/drivers/media/video/gspca/jeilinj.c
@@ -312,6 +312,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
/* create the JPEG header */
dev->jpeg_hdr = kmalloc(JPEG_HDR_SZ, GFP_KERNEL);
+ if (dev->jpeg_hdr == NULL)
+ return -ENOMEM;
jpeg_define(dev->jpeg_hdr, gspca_dev->height, gspca_dev->width,
0x21); /* JPEG 422 */
jpeg_set_qual(dev->jpeg_hdr, dev->quality);