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

adb: BKL pushdown

Browse Source 
Put explicit lock_kernel() calls in adb_open().  The fact that
adb_release() already has them suggests this is necessary.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet
2008-05-16 14:19:56 -06:00
parent 3462032d66
commit 26ce4f0684
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/macintosh/adb.c
View File

@@ -644,12 +644,18 @@ do_adb_query(struct adb_request *req)
static int adb_open(struct inode *inode, struct file *file) static int adb_open(struct inode *inode, struct file *file)
{ {
struct adbdev_state *state; struct adbdev_state *state;
int ret = 0;
if (iminor(inode) > 0 || adb_controller == NULL) lock_kernel();
return -ENXIO; if (iminor(inode) > 0 || adb_controller == NULL) {
ret = -ENXIO;
goto out;
}
state = kmalloc(sizeof(struct adbdev_state), GFP_KERNEL); state = kmalloc(sizeof(struct adbdev_state), GFP_KERNEL);
if (state == 0) if (state == 0) {
return -ENOMEM; ret = -ENOMEM;
goto out;
}
file->private_data = state; file->private_data = state;
spin_lock_init(&state->lock); spin_lock_init(&state->lock);
atomic_set(&state->n_pending, 0); atomic_set(&state->n_pending, 0);
@@ -657,7 +663,9 @@ static int adb_open(struct inode *inode, struct file *file)
init_waitqueue_head(&state->wait_queue); init_waitqueue_head(&state->wait_queue);
state->inuse = 1; state->inuse = 1;
return 0; out:
unlock_kernel();
return ret;
} }
static int adb_release(struct inode *inode, struct file *file) static int adb_release(struct inode *inode, struct file *file)