diff options
author | Jens Axboe <axboe@suse.de> | 2006-05-01 13:50:48 -0400 |
---|---|---|
committer | Jens Axboe <axboe@suse.de> | 2006-05-01 13:50:48 -0400 |
commit | 0568b409c74f7a125d92a09a3f386785700ef688 (patch) | |
tree | 79125b2f4755e98949f0d941a0092e5d3367bbff /fs/pipe.c | |
parent | 46e678c96bbd775abd05d3ddbe2fd334794f9157 (diff) |
[PATCH] splice: fix bugs in pipe_to_file()
Found by Oleg Nesterov <oleg@tv-sign.ru>, fixed by me.
- Only allow full pages to go to the page cache.
- Check page != buf->page instead of using PIPE_BUF_FLAG_STOLEN.
- Remember to clear 'stolen' if add_to_page_cache() fails.
And as a cleanup on that:
- Make the bottom fall-through logic a little less convoluted. Also make
the steal path hold an extra reference to the page, so we don't have
to differentiate between stolen and non-stolen at the end.
Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'fs/pipe.c')
-rw-r--r-- | fs/pipe.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -99,8 +99,6 @@ static void anon_pipe_buf_release(struct pipe_inode_info *pipe, | |||
99 | { | 99 | { |
100 | struct page *page = buf->page; | 100 | struct page *page = buf->page; |
101 | 101 | ||
102 | buf->flags &= ~PIPE_BUF_FLAG_STOLEN; | ||
103 | |||
104 | /* | 102 | /* |
105 | * If nobody else uses this page, and we don't already have a | 103 | * If nobody else uses this page, and we don't already have a |
106 | * temporary page, let's keep track of it as a one-deep | 104 | * temporary page, let's keep track of it as a one-deep |
@@ -130,7 +128,6 @@ static int anon_pipe_buf_steal(struct pipe_inode_info *pipe, | |||
130 | struct page *page = buf->page; | 128 | struct page *page = buf->page; |
131 | 129 | ||
132 | if (page_count(page) == 1) { | 130 | if (page_count(page) == 1) { |
133 | buf->flags |= PIPE_BUF_FLAG_STOLEN; | ||
134 | lock_page(page); | 131 | lock_page(page); |
135 | return 0; | 132 | return 0; |
136 | } | 133 | } |