summaryrefslogtreecommitdiff
path: root/ipc/msg.c
diff options
context:
space:
mode:
authorPierre Peiffer <pierre.peiffer@bull.net>2008-04-29 12:00:51 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 19:06:13 +0400
commit8f4a3809c18ff3107bdbb1fabe3f4e5d2a928321 (patch)
tree444ec369565052fde4b349c40b610caa69c93a25 /ipc/msg.c
parent016d7132f246a05e6e34ccba157fa278a96c45ae (diff)
downloadlinux-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>
Diffstat (limited to 'ipc/msg.c')
-rw-r--r--ipc/msg.c5
1 files changed, 1 insertions, 4 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.