asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

V4L/DVB (9691): gspca: Move the video device to a separate area.

Browse source 
The video device was part of the gspca device. On device disconnection
while streaming, the device structure is freed at close time.
In this case, the remaining close job on the video device run out of
allocated memory.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean-Francois Moine 2008-11-19 06:37:53 -03:00 committed by Mauro Carvalho Chehab
parent 5c4fa002b1
commit e07a1d8ab2
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/media/video/gspca/gspca.c
View file

@ -862,7 +862,7 @@ static int dev_open(struct inode *inode, struct file *file)
int ret; int ret;
PDEBUG(D_STREAM, "%s open", current->comm); PDEBUG(D_STREAM, "%s open", current->comm);
gspca_dev = (struct gspca_dev *) video_devdata(file); gspca_dev = video_drvdata(file);
if (mutex_lock_interruptible(&gspca_dev->queue_lock)) if (mutex_lock_interruptible(&gspca_dev->queue_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
if (!gspca_dev->present) { if (!gspca_dev->present) {
@ -890,10 +890,10 @@ static int dev_open(struct inode *inode, struct file *file)
#ifdef GSPCA_DEBUG #ifdef GSPCA_DEBUG
/* activate the v4l2 debug */ /* activate the v4l2 debug */
if (gspca_debug & D_V4L2) if (gspca_debug & D_V4L2)
gspca_dev->vdev.debug |= V4L2_DEBUG_IOCTL gspca_dev->vdev->debug |= V4L2_DEBUG_IOCTL
| V4L2_DEBUG_IOCTL_ARG; | V4L2_DEBUG_IOCTL_ARG;
else else
gspca_dev->vdev.debug &= ~(V4L2_DEBUG_IOCTL gspca_dev->vdev->debug &= ~(V4L2_DEBUG_IOCTL
| V4L2_DEBUG_IOCTL_ARG); | V4L2_DEBUG_IOCTL_ARG);
#endif #endif
ret = 0; ret = 0;
@ -1755,11 +1755,6 @@ out:
return ret; return ret;
} }
static void dev_release(struct video_device *vfd)
{
/* nothing */
}
static struct file_operations dev_fops = { static struct file_operations dev_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = dev_open, .open = dev_open,
@ -1807,7 +1802,7 @@ static struct video_device gspca_template = {
.name = "gspca main driver", .name = "gspca main driver",
.fops = &dev_fops, .fops = &dev_fops,
.ioctl_ops = &dev_ioctl_ops, .ioctl_ops = &dev_ioctl_ops,
.release = dev_release, /* mandatory */ .release = video_device_release,
.minor = -1, .minor = -1,
}; };
@ -1876,16 +1871,18 @@ int gspca_dev_probe(struct usb_interface *intf,
init_waitqueue_head(&gspca_dev->wq); init_waitqueue_head(&gspca_dev->wq);
/* init video stuff */ /* init video stuff */
memcpy(&gspca_dev->vdev, &gspca_template, sizeof gspca_template); gspca_dev->vdev = video_device_alloc();
gspca_dev->vdev.parent = &dev->dev; memcpy(gspca_dev->vdev, &gspca_template, sizeof gspca_template);
gspca_dev->vdev.fops = &dev_fops; gspca_dev->vdev->parent = &dev->dev;
gspca_dev->module = module; gspca_dev->module = module;
gspca_dev->present = 1; gspca_dev->present = 1;
ret = video_register_device(&gspca_dev->vdev, video_set_drvdata(gspca_dev->vdev, gspca_dev);
ret = video_register_device(gspca_dev->vdev,
VFL_TYPE_GRABBER, VFL_TYPE_GRABBER,
video_nr); video_nr);
if (ret < 0) { if (ret < 0) {
err("video_register_device err %d", ret); err("video_register_device err %d", ret);
video_device_release(gspca_dev->vdev);
goto out; goto out;
} }
@ -1893,7 +1890,8 @@ int gspca_dev_probe(struct usb_interface *intf,
PDEBUG(D_PROBE, "probe ok"); PDEBUG(D_PROBE, "probe ok");
return 0; return 0;
out: out:
kref_put(&gspca_dev->kref, gspca_delete); kfree(gspca_dev->usb_buf);
kfree(gspca_dev);
return ret; return ret;
} }
EXPORT_SYMBOL(gspca_dev_probe); EXPORT_SYMBOL(gspca_dev_probe);
@ -1911,7 +1909,7 @@ void gspca_disconnect(struct usb_interface *intf)
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
/* We don't want people trying to open up the device */ /* We don't want people trying to open up the device */
video_unregister_device(&gspca_dev->vdev); video_unregister_device(gspca_dev->vdev);
gspca_dev->present = 0; gspca_dev->present = 0;
gspca_dev->streaming = 0; gspca_dev->streaming = 0;

2
drivers/media/video/gspca/gspca.h
View file

@ -120,7 +120,7 @@ struct gspca_frame {
}; };
struct gspca_dev { struct gspca_dev {
struct video_device vdev; /* !! must be the first item */ struct video_device *vdev;
struct module *module; /* subdriver handling the device */ struct module *module; /* subdriver handling the device */
struct usb_device *dev; struct usb_device *dev;
struct kref kref; struct kref kref;