From patchwork Wed Sep 19 16:05:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Kinsbursky X-Patchwork-Id: 185097 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AA0862C0084 for ; Thu, 20 Sep 2012 02:07:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932569Ab2ISQHp (ORCPT ); Wed, 19 Sep 2012 12:07:45 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:47320 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932548Ab2ISQHk (ORCPT ); Wed, 19 Sep 2012 12:07:40 -0400 Received: from localhost6.localdomain6 ([10.30.29.152]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id q8JG67Uj018873; Wed, 19 Sep 2012 20:06:07 +0400 (MSK) Subject: [PATCH v5 05/10] ipc: add new MSG_SET command for sys_msgctl() call To: akpm@linux-foundation.org From: Stanislav Kinsbursky Cc: manfred@colorfullife.com, a.p.zijlstra@chello.nl, netdev@vger.kernel.org, will.deacon@arm.com, linux-kernel@vger.kernel.org, cmetcalf@tilera.com, jmorris@namei.org, linux-driver@qlogic.com, linux-security-module@vger.kernel.org, hughd@google.com, ron.mercer@qlogic.com, viro@zeniv.linux.org.uk, james.l.morris@oracle.com, catalin.marinas@arm.com, casey@schaufler-ca.com, eparis@parisplace.org, sds@tycho.nsa.gov, jitendra.kalsaria@qlogic.com, devel@openvz.org Date: Wed, 19 Sep 2012 20:05:54 +0400 Message-ID: <20120919160553.11254.38366.stgit@localhost6.localdomain6> In-Reply-To: <20120919160430.11254.86848.stgit@localhost6.localdomain6> References: <20120919160430.11254.86848.stgit@localhost6.localdomain6> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org New MSG_SET command will be interpreted exactly as IPC_SET, but also will update key, cuid and cgid values. IOW, it allows to change existent key value. The fact, that key is not used is checked before update. Otherwise -EEXIST is returned. Signed-off-by: Stanislav Kinsbursky --- include/linux/msg.h | 1 + ipc/compat.c | 1 + ipc/msg.c | 13 +++++++++++-- security/selinux/hooks.c | 1 + security/smack/smack_lsm.c | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/msg.h b/include/linux/msg.h index 56abf15..6689e73 100644 --- a/include/linux/msg.h +++ b/include/linux/msg.h @@ -6,6 +6,7 @@ /* ipcs ctl commands */ #define MSG_STAT 11 #define MSG_INFO 12 +#define MSG_SET 13 /* msgrcv options */ #define MSG_NOERROR 010000 /* no error if message is too big */ diff --git a/ipc/compat.c b/ipc/compat.c index 35c750d..9c70f9a 100644 --- a/ipc/compat.c +++ b/ipc/compat.c @@ -483,6 +483,7 @@ long compat_sys_msgctl(int first, int second, void __user *uptr) break; case IPC_SET: + case MSG_SET: if (version == IPC_64) { err = get_compat_msqid64(&m64, uptr); } else { diff --git a/ipc/msg.c b/ipc/msg.c index 1cecaf2..ef4f118 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -392,6 +392,9 @@ copy_msqid_from_user(struct msqid64_ds *out, void __user *buf, int version) out->msg_perm.uid = tbuf_old.msg_perm.uid; out->msg_perm.gid = tbuf_old.msg_perm.gid; out->msg_perm.mode = tbuf_old.msg_perm.mode; + out->msg_perm.cuid = tbuf_old.msg_perm.cuid; + out->msg_perm.cgid = tbuf_old.msg_perm.cgid; + out->msg_perm.key = tbuf_old.msg_perm.key; if (tbuf_old.msg_qbytes == 0) out->msg_qbytes = tbuf_old.msg_lqbytes; @@ -418,12 +421,13 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, struct msg_queue *msq; int err; - if (cmd == IPC_SET) { + if (cmd == IPC_SET || cmd == MSG_SET) { if (copy_msqid_from_user(&msqid64, buf, version)) return -EFAULT; } - ipcp = ipcctl_pre_down(ns, &msg_ids(ns), msqid, cmd, + ipcp = ipcctl_pre_down(ns, &msg_ids(ns), msqid, + (cmd != MSG_SET) ? cmd : IPC_SET, &msqid64.msg_perm, msqid64.msg_qbytes); if (IS_ERR(ipcp)) return PTR_ERR(ipcp); @@ -439,6 +443,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, freeque(ns, ipcp); goto out_up; case IPC_SET: + case MSG_SET: if (msqid64.msg_qbytes > ns->msg_ctlmnb && !capable(CAP_SYS_RESOURCE)) { err = -EPERM; @@ -447,6 +452,9 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, msq->q_qbytes = msqid64.msg_qbytes; + if (cmd == MSG_SET) + ipc_update_key(&msg_ids(ns), &msqid64.msg_perm, ipcp); + ipc_update_perm(&msqid64.msg_perm, ipcp); msq->q_ctime = get_seconds(); /* sleeping receivers might be excluded by @@ -566,6 +574,7 @@ SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *, buf) } case IPC_SET: case IPC_RMID: + case MSG_SET: err = msgctl_down(ns, msqid, cmd, buf, version); return err; default: diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 928ffc2..8269286 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -4916,6 +4916,7 @@ static int selinux_msg_queue_msgctl(struct msg_queue *msq, int cmd) perms = MSGQ__GETATTR | MSGQ__ASSOCIATE; break; case IPC_SET: + case MSG_SET: perms = MSGQ__SETATTR; break; case IPC_RMID: diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 0f2c481..193e147 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -2395,6 +2395,7 @@ static int smack_msg_queue_msgctl(struct msg_queue *msq, int cmd) may = MAY_READ; break; case IPC_SET: + case MSG_SET: case IPC_RMID: may = MAY_READWRITE; break;