From: Jonathan Corbet <corbet@lwn.net>
Date: Thu, 19 Jun 2008 21:50:37 +0000 (-0600)
Subject: tun: fasync BKL pushdown
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9d319522576ce0b2fd023a965445f9c3739ee6f1;p=deliverable%2Flinux.git

tun: fasync BKL pushdown

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index ce5af2aa8843..4c0c5972a489 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -782,18 +782,21 @@ static int tun_chr_fasync(int fd, struct file *file, int on)
 
 	DBG(KERN_INFO "%s: tun_chr_fasync %d\n", tun->dev->name, on);
 
+	lock_kernel();
 	if ((ret = fasync_helper(fd, file, on, &tun->fasync)) < 0)
-		return ret;
+		goto out;
 
 	if (on) {
 		ret = __f_setown(file, task_pid(current), PIDTYPE_PID, 0);
 		if (ret)
-			return ret;
+			goto out;
 		tun->flags |= TUN_FASYNC;
 	} else
 		tun->flags &= ~TUN_FASYNC;
-
-	return 0;
+	ret = 0;
+out:
+	unlock_kernel();
+	return ret;
 }
 
 static int tun_chr_open(struct inode *inode, struct file * file)