From 02b70218a82b6b830ec3dd260ec7666d348a5614 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 14 Nov 2008 10:38:43 +1100
Subject: [PATCH] --- yaml --- r: 120667 b: refs/heads/master c:
 ee9785ada3573700efe77b78c03d4e26a4e1bf26 h: refs/heads/master i:   120665:
 3a84eeb022b8db18c4228eeeb16a17df44568972   120663:
 e9860261cb674cad9d32083933c60d5be4f7ca26 v: v3

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

diff --git a/[refs] b/[refs]
index 12e26b58e4e9..aa36d82970ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e164b685cab357546a9a09ef234922b82ecbfaf
+refs/heads/master: ee9785ada3573700efe77b78c03d4e26a4e1bf26
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 33b6d1b122fb..b14e2025e221 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -712,9 +712,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 
 		/* Check permissions */
 		if (((tun->owner != -1 &&
-		      current->euid != tun->owner) ||
+		      current_euid() != tun->owner) ||
 		     (tun->group != -1 &&
-		      current->egid != tun->group)) &&
+		      current_egid() != tun->group)) &&
 		     !capable(CAP_NET_ADMIN))
 			return -EPERM;
 	}