From 7f8bf2feb2dc2d2ae69af5d51f6a5df964a7bcb7 Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Thu, 19 Jun 2008 15:50:37 -0600
Subject: [PATCH] --- yaml --- r: 100399 b: refs/heads/master c:
 9d319522576ce0b2fd023a965445f9c3739ee6f1 h: refs/heads/master i:   100397:
 4b4d2ced3cb161d0d81da28d4e264f83514dd325   100395:
 200212cdbf5facbc720c976ec711f7b423496972   100391:
 c98df667d1372ebe0c6862a7ba27672be118af5a   100383:
 28cf38722093c8115fc2877f1551620c7f6798ac v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/net/tun.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b311de749dc7..aaed5b8d6230 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 743115ee05f09f356d86763316acf627a7f5a6b3
+refs/heads/master: 9d319522576ce0b2fd023a965445f9c3739ee6f1
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index ce5af2aa8843..4c0c5972a489 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/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)