diff --git a/[refs] b/[refs] index 881f5112225a..4398a088d1be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a6ca57de92fcae34603551ac944aa74758c30d4 +refs/heads/master: 419f8367ea37e5adc5d95479e8fd5554b92b49fe diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c index 369a0245aab6..f98fae3e36b0 100644 --- a/trunk/fs/pipe.c +++ b/trunk/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) {