diff options
| author | Roman Gushchin <klamm@yandex-team.ru> | 2015-10-12 16:33:44 +0300 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-03-15 20:08:33 +1100 |
| commit | dbb3b088e8c6c2e8b00bf065a1e76920c378a56f (patch) | |
| tree | 98d2cda12e11bd26d10dbb36006a00a495a9da4d /fs | |
| parent | c306a0e6a789795851f862701fb9ca606ffa3fa2 (diff) | |
| download | kernel_samsung_smdk4412-dbb3b088e8c6c2e8b00bf065a1e76920c378a56f.zip kernel_samsung_smdk4412-dbb3b088e8c6c2e8b00bf065a1e76920c378a56f.tar.gz kernel_samsung_smdk4412-dbb3b088e8c6c2e8b00bf065a1e76920c378a56f.tar.bz2 | |
fuse: break infinite loop in fuse_fill_write_pages()
I got a report about unkillable task eating CPU. Further
investigation shows, that the problem is in the fuse_fill_write_pages()
function. If iov's first segment has zero length, we get an infinite
loop, because we never reach iov_iter_advance() call.
Fix this by calling iov_iter_advance() before repeating an attempt to
copy data from userspace.
A similar problem is described in 124d3b7041f ("fix writev regression:
pan hanging unkillable and un-straceable"). If zero-length segmend
is followed by segment with invalid address,
iov_iter_fault_in_readable() checks only first segment (zero-length),
iov_iter_copy_from_user_atomic() skips it, fails at second and
returns zero -> goto again without skipping zero-length segment.
Patch calls iov_iter_advance() before goto again: we'll skip zero-length
segment at second iteraction and iov_iter_fault_in_readable() will detect
invalid address.
Special thanks to Konstantin Khlebnikov, who helped a lot with the commit
description.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Maxim Patlasov <mpatlasov@parallels.com>
Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Roman Gushchin <klamm@yandex-team.ru>
Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Fixes: ea9b9907b82a ("fuse: implement perform_write")
Cc: <stable@vger.kernel.org>
Conflicts:
fs/fuse/file.c
Change-Id: Id37193373294dd43191469389cfe68ca1736a54b
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fuse/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index e5c0b5d..c404e6f 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -932,6 +932,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, pagefault_enable(); flush_dcache_page(page); + iov_iter_advance(ii, tmp); if (!tmp) { unlock_page(page); page_cache_release(page); @@ -943,7 +944,6 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, req->pages[req->num_pages] = page; req->num_pages++; - iov_iter_advance(ii, tmp); count += tmp; pos += tmp; offset += tmp; |