diff options
| author | Pierre Peiffer <pierre.peiffer@bull.net> | 2008-04-29 12:00:51 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 19:06:13 +0400 |
| commit | 8f4a3809c18ff3107bdbb1fabe3f4e5d2a928321 (patch) | |
| tree | 444ec369565052fde4b349c40b610caa69c93a25 | |
| parent | 016d7132f246a05e6e34ccba157fa278a96c45ae (diff) | |
| download | linux-8f4a3809c18ff3107bdbb1fabe3f4e5d2a928321.tar.xz | |
IPC: introduce ipc_update_perm()
The IPC_SET command performs the same permission setting for all IPCs. This
patch introduces a common ipc_update_perm() function to update these
permissions and makes use of it for all IPCs.
Signed-off-by: Pierre Peiffer <pierre.peiffer@bull.net>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Cc: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | ipc/msg.c | 5 | ||||
| -rw-r--r-- | ipc/sem.c | 5 | ||||
| -rw-r--r-- | ipc/shm.c | 5 | ||||
| -rw-r--r-- | ipc/util.c | 13 | ||||
| -rw-r--r-- | ipc/util.h | 1 |
5 files changed, 17 insertions, 12 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index 80375bf43d7b..87d8b3852300 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -484,10 +484,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, msq->q_qbytes = msqid64.msg_qbytes; - ipcp->uid = msqid64.msg_perm.uid; - ipcp->gid = msqid64.msg_perm.gid; - ipcp->mode = (ipcp->mode & ~S_IRWXUGO) | - (S_IRWXUGO & msqid64.msg_perm.mode); + ipc_update_perm(&msqid64.msg_perm, ipcp); msq->q_ctime = get_seconds(); /* sleeping receivers might be excluded by * stricter permissions. diff --git a/ipc/sem.c b/ipc/sem.c index df98de290475..e803abec2b08 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -913,10 +913,7 @@ static int semctl_down(struct ipc_namespace *ns, int semid, freeary(ns, ipcp); goto out_up; case IPC_SET: - ipcp->uid = semid64.sem_perm.uid; - ipcp->gid = semid64.sem_perm.gid; - ipcp->mode = (ipcp->mode & ~S_IRWXUGO) - | (semid64.sem_perm.mode & S_IRWXUGO); + ipc_update_perm(&semid64.sem_perm, ipcp); sma->sem_ctime = get_seconds(); break; default: diff --git a/ipc/shm.c b/ipc/shm.c index 5e296b04bd6b..20e03dfc6adb 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -656,10 +656,7 @@ static int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd, do_shm_rmid(ns, ipcp); goto out_up; case IPC_SET: - ipcp->uid = shmid64.shm_perm.uid; - ipcp->gid = shmid64.shm_perm.gid; - ipcp->mode = (ipcp->mode & ~S_IRWXUGO) - | (shmid64.shm_perm.mode & S_IRWXUGO); + ipc_update_perm(&shmid64.shm_perm, ipcp); shp->shm_ctim = get_seconds(); break; default: diff --git a/ipc/util.c b/ipc/util.c index 7a5d5e393c4b..dc8943aa9719 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -811,6 +811,19 @@ int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids, return ipcget_public(ns, ids, ops, params); } +/** + * ipc_update_perm - update the permissions of an IPC. + * @in: the permission given as input. + * @out: the permission of the ipc to set. + */ +void ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out) +{ + out->uid = in->uid; + out->gid = in->gid; + out->mode = (out->mode & ~S_IRWXUGO) + | (in->mode & S_IRWXUGO); +} + #ifdef __ARCH_WANT_IPC_PARSE_VERSION diff --git a/ipc/util.h b/ipc/util.h index 0e3d79037a2a..12966913ebc6 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -112,6 +112,7 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int); void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out); void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out); +void ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out); #if defined(__ia64__) || defined(__x86_64__) || defined(__hppa__) || defined(__XTENSA__) /* On IA-64, we always use the "64-bit version" of the IPC structures. */ |