summaryrefslogtreecommitdiffstats
path: root/ipc/shm.c
diff options
context:
space:
mode:
authorPierre Peiffer <pierre.peiffer@bull.net>2008-04-29 01:00:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 08:06:13 -0700
commit8f4a3809c18ff3107bdbb1fabe3f4e5d2a928321 (patch)
tree444ec369565052fde4b349c40b610caa69c93a25 /ipc/shm.c
parent016d7132f246a05e6e34ccba157fa278a96c45ae (diff)
downloadop-kernel-dev-8f4a3809c18ff3107bdbb1fabe3f4e5d2a928321.zip
op-kernel-dev-8f4a3809c18ff3107bdbb1fabe3f4e5d2a928321.tar.gz
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>
Diffstat (limited to 'ipc/shm.c')
-rw-r--r--ipc/shm.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 5e296b0..20e03df 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:
OpenPOWER on IntegriCloud