[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <583c60bf335068e68b9d84a07a2355b9da11f911.1334676645.git.dledford@redhat.com>
Date: Tue, 17 Apr 2012 11:46:20 -0400
From: Doug Ledford <dledford@...hat.com>
To: linux-kernel@...r.kernel.org
Cc: akpm@...ux-foundation.org, kosaki.motohiro@...il.com,
Doug Ledford <dledford@...hat.com>
Subject: [Patch 3/8] 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 <dledford@...hat.com>
---
ipc/mqueue.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index b178268..8f75d84 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -299,8 +299,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;
}
@@ -584,7 +585,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 ||
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists