diff options
| author | David Howells <dhowells@redhat.com> | 2008-11-14 10:39:11 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-14 10:39:11 +1100 |
| commit | 47d804bfa1857b0edcac972c86499dcd14df3cf2 (patch) | |
| tree | 200b2d1190e29be40c771bf6a4e0db0ef9e7d383 /security/keys/keyctl.c | |
| parent | 8192b0c482d7078fcdcb4854341b977426f6f09b (diff) | |
| download | linux-47d804bfa1857b0edcac972c86499dcd14df3cf2.tar.gz linux-47d804bfa1857b0edcac972c86499dcd14df3cf2.tar.bz2 linux-47d804bfa1857b0edcac972c86499dcd14df3cf2.zip | |
CRED: Wrap task credential accesses in the key management code
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>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/keys/keyctl.c')
| -rw-r--r-- | security/keys/keyctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index acc9c89e40a8..3f09e5b2a784 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -817,7 +817,7 @@ long keyctl_setperm_key(key_serial_t id, key_perm_t perm) down_write(&key->sem); /* if we're not the sysadmin, we can only change a key that we own */ - if (capable(CAP_SYS_ADMIN) || key->uid == current->fsuid) { + if (capable(CAP_SYS_ADMIN) || key->uid == current_fsuid()) { key->perm = perm; ret = 0; } |