diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-05-16 22:28:31 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-06-20 22:05:53 +0200 |
| commit | 6606470dd1d628878383c96d10b52a77986ddac7 (patch) | |
| tree | a7e3eb4ef5c81259bf7bd258981e7efac0b5f7c1 /drivers/media/video/videodev.c | |
| parent | usbdev: BKL pushdown (diff) | |
| download | linux-6606470dd1d628878383c96d10b52a77986ddac7.tar.xz linux-6606470dd1d628878383c96d10b52a77986ddac7.zip | |
videodev: BKL pushdown
Put explicit lock_kernel() calls into videodev_open(). That function
itself seems OK, but one never knows about all the open() functions
provided by underlying video drivers.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers/media/video/videodev.c')
| -rw-r--r-- | drivers/media/video/videodev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 31e8af0ba278..e5679c28163f 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c @@ -36,6 +36,7 @@ #include <linux/init.h> #include <linux/kmod.h> #include <linux/slab.h> +#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/system.h> @@ -496,6 +497,7 @@ static int video_open(struct inode *inode, struct file *file) if(minor>=VIDEO_NUM_DEVICES) return -ENODEV; + lock_kernel(); mutex_lock(&videodev_lock); vfl=video_device[minor]; if(vfl==NULL) { @@ -505,6 +507,7 @@ static int video_open(struct inode *inode, struct file *file) vfl=video_device[minor]; if (vfl==NULL) { mutex_unlock(&videodev_lock); + unlock_kernel(); return -ENODEV; } } @@ -518,6 +521,7 @@ static int video_open(struct inode *inode, struct file *file) } fops_put(old_fops); mutex_unlock(&videodev_lock); + unlock_kernel(); return err; } |