Skip to content

Commit

Permalink
USB Monitor: BKL pushdown
Browse files Browse the repository at this point in the history
Add explicit lock_kernel() calls to mon_bin_open()

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  • Loading branch information
Jonathan Corbet committed Jun 20, 2008
1 parent b2f2ba0 commit 1af46fd
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/usb/mon/mon_bin.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <linux/poll.h>
#include <linux/compat.h>
#include <linux/mm.h>
#include <linux/smp_lock.h>

#include <asm/uaccess.h>

Expand Down Expand Up @@ -527,14 +528,17 @@ static int mon_bin_open(struct inode *inode, struct file *file)
size_t size;
int rc;

lock_kernel();
mutex_lock(&mon_lock);
if ((mbus = mon_bus_lookup(iminor(inode))) == NULL) {
mutex_unlock(&mon_lock);
unlock_kernel();
return -ENODEV;
}
if (mbus != &mon_bus0 && mbus->u_bus == NULL) {
printk(KERN_ERR TAG ": consistency error on open\n");
mutex_unlock(&mon_lock);
unlock_kernel();
return -ENODEV;
}

Expand Down Expand Up @@ -568,6 +572,7 @@ static int mon_bin_open(struct inode *inode, struct file *file)

file->private_data = rp;
mutex_unlock(&mon_lock);
unlock_kernel();
return 0;

err_allocbuff:
Expand All @@ -576,6 +581,7 @@ static int mon_bin_open(struct inode *inode, struct file *file)
kfree(rp);
err_alloc:
mutex_unlock(&mon_lock);
unlock_kernel();
return rc;
}

Expand Down

0 comments on commit 1af46fd

Please sign in to comment.