From: Doug Ledford Date: Thu, 8 Dec 2011 04:33:16 +0000 (+1100) Subject: ipc/mqueue: enforce hard limits X-Git-Tag: next-20111209~3^2~194 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5de0150997347cee23b3364787a9eb18e4fb8aaf;p=karo-tx-linux.git ipc/mqueue: enforce hard limits In two places we don't enforce the hard limits for CAP_SYS_RESOURCE apps. In preparation for making more reasonable hard limits, start enforcing them even on CAP_SYS_RESOURCE. Signed-off-by: Doug Ledford Cc: Amerigo Wang Cc: Serge E. Hallyn Cc: Joe Korty Cc: Manfred Spraul Cc: Cc: Signed-off-by: Andrew Morton --- diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 7394468cde43..b9492556fd88 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -310,8 +310,9 @@ static int mqueue_create(struct inode *dir, struct dentry *dentry, error = -EACCES; goto out_unlock; } - if (ipc_ns->mq_queues_count >= ipc_ns->mq_queues_max && - !capable(CAP_SYS_RESOURCE)) { + if (ipc_ns->mq_queues_count >= HARD_QUEUESMAX || + (ipc_ns->mq_queues_count >= ipc_ns->mq_queues_max && + !capable(CAP_SYS_RESOURCE))) { error = -ENOSPC; goto out_unlock; } @@ -591,7 +592,8 @@ static int mq_attr_ok(struct ipc_namespace *ipc_ns, struct mq_attr *attr) if (attr->mq_maxmsg <= 0 || attr->mq_msgsize <= 0) return 0; if (capable(CAP_SYS_RESOURCE)) { - if (attr->mq_maxmsg > HARD_MSGMAX) + if (attr->mq_maxmsg > HARD_MSGMAX || + attr->mq_msgsize > HARD_MSGSIZEMAX) return 0; } else { if (attr->mq_maxmsg > ipc_ns->mq_msg_max ||