Commit 36e1ed69 authored by Jens Axboe's avatar Jens Axboe Committed by Greg Kroah-Hartman

splice: fix double page unlock

If add_to_page_cache_lru() fails, the page will not be locked. But
splice jumps to an error path that does a page release and unlock,
causing a BUG() in unlock_page().

Fix this by adding one more label that just releases the page. This bug
was actually triggered on EL5 by gurudas pai <gurudas.pai@oracle.com>
using fio.
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6b6c2126
...@@ -601,7 +601,7 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf, ...@@ -601,7 +601,7 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
ret = add_to_page_cache_lru(page, mapping, index, ret = add_to_page_cache_lru(page, mapping, index,
GFP_KERNEL); GFP_KERNEL);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out_release;
} }
ret = mapping->a_ops->prepare_write(file, page, offset, offset+this_len); ret = mapping->a_ops->prepare_write(file, page, offset, offset+this_len);
...@@ -657,8 +657,9 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf, ...@@ -657,8 +657,9 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
*/ */
mark_page_accessed(page); mark_page_accessed(page);
out: out:
page_cache_release(page);
unlock_page(page); unlock_page(page);
out_release:
page_cache_release(page);
out_ret: out_ret:
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment