lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

phonedev: cdev lock_kernel() pushdown

Browse Source 
phone_open() looks OK, but I don't trust the subsidiary drivers (and ixj in
particular).

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet
2008-05-15 11:58:31 -06:00
parent 70ffa16e60
commit 16750c2f32
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/telephony/phonedev.c
View File

@@ -23,6 +23,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/phonedev.h> #include <linux/phonedev.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
@@ -53,6 +54,7 @@ static int phone_open(struct inode *inode, struct file *file)
if (minor >= PHONE_NUM_DEVICES) if (minor >= PHONE_NUM_DEVICES)
return -ENODEV; return -ENODEV;
lock_kernel();
mutex_lock(&phone_lock); mutex_lock(&phone_lock);
p = phone_device[minor]; p = phone_device[minor];
if (p) if (p)
@@ -79,6 +81,7 @@ static int phone_open(struct inode *inode, struct file *file)
fops_put(old_fops); fops_put(old_fops);
end: end:
mutex_unlock(&phone_lock); mutex_unlock(&phone_lock);
unlock_kernel();
return err; return err;
} }