diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2014-01-22 13:36:57 -0500 |
---|---|---|
committer | Miklos Szeredi <mszeredi@suse.cz> | 2014-01-22 13:36:57 -0500 |
commit | 28a625cbc2a14f17b83e47ef907b2658576a32aa (patch) | |
tree | 58d461b91f25a6499bd6404cd79faa4f9c185ff0 /fs/splice.c | |
parent | d8ec26d7f8287f5788a494f56e8814210f0e64be (diff) |
fuse: fix pipe_buf_operations
Having this struct in module memory could Oops when if the module is
unloaded while the buffer still persists in a pipe.
Since sock_pipe_buf_ops is essentially the same as fuse_dev_pipe_buf_steal
merge them into nosteal_pipe_buf_ops (this is the same as
default_pipe_buf_ops except stealing the page from the buffer is not
allowed).
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/splice.c')
-rw-r--r-- | fs/splice.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/fs/splice.c b/fs/splice.c index 46a08f772d7d..12028fa41def 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
@@ -555,6 +555,24 @@ static const struct pipe_buf_operations default_pipe_buf_ops = { | |||
555 | .get = generic_pipe_buf_get, | 555 | .get = generic_pipe_buf_get, |
556 | }; | 556 | }; |
557 | 557 | ||
558 | static int generic_pipe_buf_nosteal(struct pipe_inode_info *pipe, | ||
559 | struct pipe_buffer *buf) | ||
560 | { | ||
561 | return 1; | ||
562 | } | ||
563 | |||
564 | /* Pipe buffer operations for a socket and similar. */ | ||
565 | const struct pipe_buf_operations nosteal_pipe_buf_ops = { | ||
566 | .can_merge = 0, | ||
567 | .map = generic_pipe_buf_map, | ||
568 | .unmap = generic_pipe_buf_unmap, | ||
569 | .confirm = generic_pipe_buf_confirm, | ||
570 | .release = generic_pipe_buf_release, | ||
571 | .steal = generic_pipe_buf_nosteal, | ||
572 | .get = generic_pipe_buf_get, | ||
573 | }; | ||
574 | EXPORT_SYMBOL(nosteal_pipe_buf_ops); | ||
575 | |||
558 | static ssize_t kernel_readv(struct file *file, const struct iovec *vec, | 576 | static ssize_t kernel_readv(struct file *file, const struct iovec *vec, |
559 | unsigned long vlen, loff_t offset) | 577 | unsigned long vlen, loff_t offset) |
560 | { | 578 | { |