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

UIO: cdev lock_kernel() pushdown

Browse Source 
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet
2008-05-15 10:39:37 -06:00
parent 2edbf8537e
commit fbc8a81d66
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/uio/uio.c
View File

@@ -297,12 +297,17 @@ static int uio_open(struct inode *inode, struct file *filep)
struct uio_listener *listener; struct uio_listener *listener;
int ret = 0; int ret = 0;
lock_kernel();
idev = idr_find(&uio_idr, iminor(inode)); idev = idr_find(&uio_idr, iminor(inode));
if (!idev) if (!idev) {
return -ENODEV; ret = -ENODEV;
goto out;
}
if (!try_module_get(idev->owner)) if (!try_module_get(idev->owner)) {
return -ENODEV; ret = -ENODEV;
goto out;
}
listener = kmalloc(sizeof(*listener), GFP_KERNEL); listener = kmalloc(sizeof(*listener), GFP_KERNEL);
if (!listener) { if (!listener) {
@@ -319,7 +324,7 @@ static int uio_open(struct inode *inode, struct file *filep)
if (ret) if (ret)
goto err_infoopen; goto err_infoopen;
} }
unlock_kernel();
return 0; return 0;
err_infoopen: err_infoopen:
@@ -329,6 +334,8 @@ err_alloc_listener:
module_put(idev->owner); module_put(idev->owner);
out:
unlock_kernel();
return ret; return ret;
} }