diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2010-06-09 09:27:57 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-10 19:08:34 +0200 |
| commit | 6db40cf047a8723095caf79f5569d21b388d7b31 (patch) | |
| tree | f1bb31671c39ef8cb990ee2c28ef34f7ce8a8aca | |
| parent | pipe: fix pipe buffer resizing (diff) | |
| download | linux-6db40cf047a8723095caf79f5569d21b388d7b31.tar.xz linux-6db40cf047a8723095caf79f5569d21b388d7b31.zip | |
pipe: fix check in "set size" fcntl
As it stands this check compares the number of pages to the page size.
This makes no sense and makes the fcntl fail in almost any sane case.
Fix it by checking if nr_pages is not zero (it can become zero only if
arg is too big and round_pipe_size() overflows).
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
| -rw-r--r-- | fs/pipe.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index f31e2d472984..279eef96c51c 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -1215,12 +1215,13 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg) size = round_pipe_size(arg); nr_pages = size >> PAGE_SHIFT; + ret = -EINVAL; + if (!nr_pages) + goto out; + if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) { ret = -EPERM; goto out; - } else if (nr_pages < PAGE_SIZE) { - ret = -EINVAL; - goto out; } ret = pipe_set_size(pipe, nr_pages); break; |