diff options
| author | Brandon Philips <bphilips@suse.de> | 2007-10-05 21:26:27 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-10 05:03:20 +0200 |
| commit | 49ee718ef51f4d938f80f67207e1bfa2a38897a4 (patch) | |
| tree | 1f6079f64f6196e50cd9ed993fe1e3a2c8eb4331 /drivers/media/common/saa7146_video.c | |
| parent | V4L/DVB (6301): pvrusb: Update DEBUGIFC sysfs to kernel 2.6.13+ (diff) | |
| download | linux-49ee718ef51f4d938f80f67207e1bfa2a38897a4.tar.xz linux-49ee718ef51f4d938f80f67207e1bfa2a38897a4.zip | |
V4L/DVB (6305): V4L: videobuf-core.c avoid NULL dereferences in videobuf-core
The return value of videobuf_alloc() is unchecked but this function will
return NULL on an error. Check for NULL and make videobuf_reqbufs()
return the number of successfully allocated buffers.
Also, fix saa7146_video.c and bttv-driver.c to use this returned
buffer count.
Tested against the vivi driver. Not tested against saa7146 or bt8xx
devices.
Signed-off-by: Brandon Philips <bphilips@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/common/saa7146_video.c')
| -rw-r--r-- | drivers/media/common/saa7146_video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 29dbc602a484..f245a3b2ef47 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c @@ -1212,6 +1212,8 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int mutex_unlock(&q->lock); return err; } + + gbuffers = err; memset(mbuf,0,sizeof(*mbuf)); mbuf->frames = gbuffers; mbuf->size = gbuffers * gbufsize; |