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

phantom: BKL pushdown

Browse Source 
Add explicit lock_kernel calls to phantom_open().

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet
2008-05-16 14:03:05 -06:00
parent 057e7c7ff9
commit 4541b5ec9f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/misc/phantom.c
View File

@@ -22,6 +22,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/cdev.h> #include <linux/cdev.h>
#include <linux/phantom.h> #include <linux/phantom.h>
#include <linux/smp_lock.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/io.h> #include <asm/io.h>
@@ -212,13 +213,17 @@ static int phantom_open(struct inode *inode, struct file *file)
struct phantom_device *dev = container_of(inode->i_cdev, struct phantom_device *dev = container_of(inode->i_cdev,
struct phantom_device, cdev); struct phantom_device, cdev);
lock_kernel();
nonseekable_open(inode, file); nonseekable_open(inode, file);
if (mutex_lock_interruptible(&dev->open_lock)) if (mutex_lock_interruptible(&dev->open_lock)) {
unlock_kernel();
return -ERESTARTSYS; return -ERESTARTSYS;
}
if (dev->opened) { if (dev->opened) {
mutex_unlock(&dev->open_lock); mutex_unlock(&dev->open_lock);
unlock_kernel();
return -EINVAL; return -EINVAL;
} }
@@ -229,7 +234,7 @@ static int phantom_open(struct inode *inode, struct file *file)
atomic_set(&dev->counter, 0); atomic_set(&dev->counter, 0);
dev->opened++; dev->opened++;
mutex_unlock(&dev->open_lock); mutex_unlock(&dev->open_lock);
unlock_kernel();
return 0; return 0;
} }