summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-06-03 12:45:28 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-06-03 12:45:28 +0200
commit419f8367ea37e5adc5d95479e8fd5554b92b49fe (patch)
tree37ed8fbd17e48fa82410a6c1a42ea8e0df2c26ae
parent6a6ca57de92fcae34603551ac944aa74758c30d4 (diff)
downloadop-kernel-dev-419f8367ea37e5adc5d95479e8fd5554b92b49fe.zip
op-kernel-dev-419f8367ea37e5adc5d95479e8fd5554b92b49fe.tar.gz
pipe: change the privilege required for growing a pipe beyond system max
Change it to CAP_SYS_RESOURCE, as that more accurately models what we want to control. Suggested-by: Michael Kerrisk <mtk.manpages@googlemail.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--fs/pipe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index 369a024..f98fae3 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -1178,7 +1178,7 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
nr_pages = (arg + PAGE_SIZE - 1) >> PAGE_SHIFT;
nr_pages = roundup_pow_of_two(nr_pages);
- if (!capable(CAP_SYS_ADMIN) && nr_pages > pipe_max_pages) {
+ if (!capable(CAP_SYS_RESOURCE) && nr_pages > pipe_max_pages) {
ret = -EPERM;
goto out;
} else if (nr_pages < 1) {
OpenPOWER on IntegriCloud