UIO: cdev lock_kernel() pushdown

Signed-off-by: Jonathan Corbet <[email protected]>
cbmeeks · Jun 20, 2008 · fbc8a81 · fbc8a81
1 parent 2edbf85
commit fbc8a81
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
@@ -297,12 +297,17 @@ static int uio_open(struct inode *inode, struct file *filep)
 	struct uio_listener *listener;
 	int ret = 0;
 
+	lock_kernel();
 	idev = idr_find(&uio_idr, iminor(inode));
-	if (!idev)
-		return -ENODEV;
+	if (!idev) {
+		ret = -ENODEV;
+		goto out;
+	}
 
-	if (!try_module_get(idev->owner))
-		return -ENODEV;
+	if (!try_module_get(idev->owner)) {
+		ret = -ENODEV;
+		goto out;
+	}
 
 	listener = kmalloc(sizeof(*listener), GFP_KERNEL);
 	if (!listener) {
@@ -319,7 +324,7 @@ static int uio_open(struct inode *inode, struct file *filep)
 		if (ret)
 			goto err_infoopen;
 	}
-
+	unlock_kernel();
 	return 0;
 
 err_infoopen:
@@ -329,6 +334,8 @@ static int uio_open(struct inode *inode, struct file *filep)
 
 	module_put(idev->owner);
 
+out:
+	unlock_kernel();
 	return ret;
 }