diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2006-04-10 22:54:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 06:18:47 -0700 |
| commit | d3406ffa4af8af1d7c14cff06e003eb0a557d4ad (patch) | |
| tree | e521174613659a167f56e9890c403f9fa95a50ca /fs | |
| parent | 3e16f6afb267c0256416d481862ce8019c33417d (diff) | |
| download | op-kernel-dev-d3406ffa4af8af1d7c14cff06e003eb0a557d4ad.zip op-kernel-dev-d3406ffa4af8af1d7c14cff06e003eb0a557d4ad.tar.gz | |
[PATCH] fuse: fix oops in fuse_send_readpages()
During heavy parallel filesystem activity it was possible to Oops the kernel.
The reason is that read_cache_pages() could skip pages which have already been
inserted into the cache by another task. Occasionally this may result in zero
pages actually being sent, while fuse_send_readpages() relies on at least one
page being in the request.
So check this corner case and just free the request instead of trying to send
it.
Reported and tested by Konstantin Isakov.
Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fuse/file.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 975f269..3ac39c0 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -397,8 +397,12 @@ static int fuse_readpages(struct file *file, struct address_space *mapping, return -EINTR; err = read_cache_pages(mapping, pages, fuse_readpages_fill, &data); - if (!err) - fuse_send_readpages(data.req, file, inode); + if (!err) { + if (data.req->num_pages) + fuse_send_readpages(data.req, file, inode); + else + fuse_put_request(fc, data.req); + } return err; } |
