diff options
| author | David Howells <dhowells@redhat.com> | 2008-11-14 10:39:06 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-14 10:39:06 +1100 |
| commit | 414c0708d0d60eccf8345c405ac81cf32c43e901 (patch) | |
| tree | 5c3a5bd4c421176164475f87dc2f3cdb0de905e0 /ipc/shm.c | |
| parent | da9592edebceeba1b9301beafe80ec8b9c2db0ce (diff) | |
| download | kernel-common-414c0708d0d60eccf8345c405ac81cf32c43e901.tar.gz kernel-common-414c0708d0d60eccf8345c405ac81cf32c43e901.tar.bz2 kernel-common-414c0708d0d60eccf8345c405ac81cf32c43e901.zip | |
CRED: Wrap task credential accesses in the SYSV IPC subsystem
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 'ipc/shm.c')
| -rw-r--r-- | ipc/shm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index 867e5d6a55c2..0c3debbe32d5 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -752,9 +752,10 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf) goto out_unlock; if (!capable(CAP_IPC_LOCK)) { + uid_t euid = current_euid(); err = -EPERM; - if (current->euid != shp->shm_perm.uid && - current->euid != shp->shm_perm.cuid) + if (euid != shp->shm_perm.uid && + euid != shp->shm_perm.cuid) goto out_unlock; if (cmd == SHM_LOCK && !current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) |