diff options
| author | David Howells <dhowells@redhat.com> | 2008-11-14 10:38:43 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-14 10:38:43 +1100 |
| commit | ee9785ada3573700efe77b78c03d4e26a4e1bf26 (patch) | |
| tree | 8e7ed03fa61a04c3a35b99cab0835b99d41488ea | |
| parent | 0e164b685cab357546a9a09ef234922b82ecbfaf (diff) | |
| download | linux-3.10-ee9785ada3573700efe77b78c03d4e26a4e1bf26.tar.gz linux-3.10-ee9785ada3573700efe77b78c03d4e26a4e1bf26.tar.bz2 linux-3.10-ee9785ada3573700efe77b78c03d4e26a4e1bf26.zip | |
CRED: Wrap task credential accesses in the network device drivers
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>
| -rw-r--r-- | drivers/net/tun.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 33b6d1b122f..b14e2025e22 100644 --- a/drivers/net/tun.c +++ b/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; } |