Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups

Browse source 
Fix a bug in get_index that was introduced earlier.
Also fix two error handling lock-ups in videodev and cx18 that
where found thanks to that bug.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2008-07-18 10:07:10 -03:00 • committed by Mauro Carvalho Chehab
parent f19ad39014
commit fac3639d88
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/video/cx18/cx18-streams.c
View file

@ -311,8 +311,10 @@ void cx18_streams_cleanup(struct cx18 *cx, int unregister)
/* Teardown all streams */ /* Teardown all streams */
for (type = 0; type < CX18_MAX_STREAMS; type++) { for (type = 0; type < CX18_MAX_STREAMS; type++) {
if (cx->streams[type].dvb.enabled) if (cx->streams[type].dvb.enabled) {
cx18_dvb_unregister(&cx->streams[type]); cx18_dvb_unregister(&cx->streams[type]);
cx->streams[type].dvb.enabled = false;
}
vdev = cx->streams[type].v4l2dev; vdev = cx->streams[type].v4l2dev;

9
drivers/media/video/videodev.c
View file

@ -2023,7 +2023,7 @@ EXPORT_SYMBOL(video_ioctl2);
static int get_index(struct video_device *vdev, int num) static int get_index(struct video_device *vdev, int num)
{ {
u32 used = 0; u32 used = 0;
const unsigned max_index = sizeof(used) * 8 - 1; const int max_index = sizeof(used) * 8 - 1;
int i; int i;
/* Currently a single v4l driver instance cannot create more than /* Currently a single v4l driver instance cannot create more than
@ -2145,14 +2145,15 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
vfd->minor=i; vfd->minor=i;
ret = get_index(vfd, index); ret = get_index(vfd, index);
vfd->index = ret;
mutex_unlock(&videodev_lock);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "%s: get_index failed\n", __func__); printk(KERN_ERR "%s: get_index failed\n", __func__);
goto fail_minor; goto fail_minor;
} }
vfd->index = ret;
mutex_unlock(&videodev_lock);
mutex_init(&vfd->lock); mutex_init(&vfd->lock);
/* sysfs class */ /* sysfs class */