CRED: Wrap task credential accesses in the network device drivers
authorDavid Howells <dhowells@redhat.com>
Thu, 13 Nov 2008 23:38:43 +0000 (10:38 +1100)
committerJames Morris <jmorris@namei.org>
Thu, 13 Nov 2008 23:38:43 +0000 (10:38 +1100)
Wrap access to task credentials so that they can be separated more easily from
the task_struct during the introduction of COW creds.

Change most current->(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id().

Change some task->e?[ug]id to task_e?[ug]id().  In some places it makes more
sense to use RCU directly rather than a convenient wrapper; these will be
addressed by later patches.

Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Cc: netdev@vger.kernel.org
Signed-off-by: James Morris <jmorris@namei.org>
drivers/net/tun.c

index 33b6d1b122fb59fdadfdd2f156a0596f37efcc25..b14e2025e22170d20d3e4c24482bceea0f284a75 100644 (file)
@@ -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;
        }