lkml.org 
[lkml]   [2010]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH 2/2] pipe: remove bogus check from "set size" fcntl
From
Date
On Tue, 08 Jun 2010, Miklos Szeredi wrote:
> From: Miklos Szeredi <mszeredi@suse.cz>
>
> 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 removing the check completely, round_pipe_size() will make
> sure that nr_pages >= 1 anyway.

Hmm, not quite true. It can actually return zero if round_pipe_size()
overflows unsigned int.

Updated patch below.

Thanks,
Miklos
----

From: Miklos Szeredi <mszeredi@suse.cz>
Subject: 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>
---
fs/pipe.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

Index: linux-2.6/fs/pipe.c
===================================================================
--- linux-2.6.orig/fs/pipe.c 2010-06-08 16:48:18.000000000 +0200
+++ linux-2.6/fs/pipe.c 2010-06-08 17:12:04.000000000 +0200
@@ -1215,12 +1215,13 @@ long pipe_fcntl(struct file *file, unsig
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;



\
 
 \ /
  Last update: 2010-06-08 17:17    [W:0.040 / U:9.560 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site