mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
fuse: Don't access pipe->buffers without pipe_lock()
fuse_dev_splice_write() reads pipe->buffers to determine the size of
'bufs' array before taking the pipe_lock(). This is not safe as
another thread might change the 'pipe->buffers' between the allocation
and taking the pipe_lock(). So we end up with too small 'bufs' array.
Move the bufs allocations inside pipe_lock()/pipe_unlock() to fix this.
Fixes: dd3bb14f44
("fuse: support splice() writing to fuse device")
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: <stable@vger.kernel.org> # v2.6.35
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
parent
63576c13bd
commit
a2477b0e67
1 changed files with 5 additions and 2 deletions
|
@ -1955,12 +1955,15 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,
|
|||
if (!fud)
|
||||
return -EPERM;
|
||||
|
||||
pipe_lock(pipe);
|
||||
|
||||
bufs = kmalloc_array(pipe->buffers, sizeof(struct pipe_buffer),
|
||||
GFP_KERNEL);
|
||||
if (!bufs)
|
||||
if (!bufs) {
|
||||
pipe_unlock(pipe);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
pipe_lock(pipe);
|
||||
nbuf = 0;
|
||||
rem = 0;
|
||||
for (idx = 0; idx < pipe->nrbufs && rem < len; idx++)
|
||||
|
|
Loading…
Reference in a new issue