Skip to content

Commit 2e949b0

Browse files
Liu Bokdave
authored andcommitted
Btrfs: fix invalid dereference in btrfs_retry_endio
When doing directIO repair, we have this oops: [ 1458.532816] general protection fault: 0000 [#1] SMP ... [ 1458.536291] Workqueue: btrfs-endio-repair btrfs_endio_repair_helper [btrfs] [ 1458.536893] task: ffff88082a42d100 task.stack: ffffc90002b3c000 [ 1458.537499] RIP: 0010:btrfs_retry_endio+0x7e/0x1a0 [btrfs] ... [ 1458.543261] Call Trace: [ 1458.543958] ? rcu_read_lock_sched_held+0xc4/0xd0 [ 1458.544374] bio_endio+0xed/0x100 [ 1458.544750] end_workqueue_fn+0x3c/0x40 [btrfs] [ 1458.545257] normal_work_helper+0x9f/0x900 [btrfs] [ 1458.545762] btrfs_endio_repair_helper+0x12/0x20 [btrfs] [ 1458.546224] process_one_work+0x34d/0xb70 [ 1458.546570] ? process_one_work+0x29e/0xb70 [ 1458.546938] worker_thread+0x1cf/0x960 [ 1458.547263] ? process_one_work+0xb70/0xb70 [ 1458.547624] kthread+0x17d/0x180 [ 1458.547909] ? kthread_create_on_node+0x70/0x70 [ 1458.548300] ret_from_fork+0x31/0x40 It turns out that btrfs_retry_endio is trying to get inode from a directIO page. This fixes the problem by using the saved inode pointer, done->inode. btrfs_retry_endio_nocsum has the same problem, and it's fixed as well. Also cleanup unused @start (which is too trivial for a separate patch). Cc: David Sterba <dsterba@suse.cz> Signed-off-by: Liu Bo <bo.li.liu@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 951e796 commit 2e949b0

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

fs/btrfs/inode.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7910,20 +7910,19 @@ struct btrfs_retry_complete {
79107910
static void btrfs_retry_endio_nocsum(struct bio *bio)
79117911
{
79127912
struct btrfs_retry_complete *done = bio->bi_private;
7913-
struct inode *inode;
79147913
struct bio_vec *bvec;
79157914
int i;
79167915

79177916
if (bio->bi_error)
79187917
goto end;
79197918

79207919
ASSERT(bio->bi_vcnt == 1);
7921-
inode = bio->bi_io_vec->bv_page->mapping->host;
7922-
ASSERT(bio->bi_io_vec->bv_len == btrfs_inode_sectorsize(inode));
7920+
ASSERT(bio->bi_io_vec->bv_len == btrfs_inode_sectorsize(done->inode));
79237921

79247922
done->uptodate = 1;
79257923
bio_for_each_segment_all(bvec, bio, i)
7926-
clean_io_failure(BTRFS_I(done->inode), done->start, bvec->bv_page, 0);
7924+
clean_io_failure(BTRFS_I(done->inode), done->start,
7925+
bvec->bv_page, 0);
79277926
end:
79287927
complete(&done->done);
79297928
bio_put(bio);
@@ -7986,9 +7985,7 @@ static void btrfs_retry_endio(struct bio *bio)
79867985
{
79877986
struct btrfs_retry_complete *done = bio->bi_private;
79887987
struct btrfs_io_bio *io_bio = btrfs_io_bio(bio);
7989-
struct inode *inode;
79907988
struct bio_vec *bvec;
7991-
u64 start;
79927989
int uptodate;
79937990
int ret;
79947991
int i;
@@ -7998,11 +7995,8 @@ static void btrfs_retry_endio(struct bio *bio)
79987995

79997996
uptodate = 1;
80007997

8001-
start = done->start;
8002-
80037998
ASSERT(bio->bi_vcnt == 1);
8004-
inode = bio->bi_io_vec->bv_page->mapping->host;
8005-
ASSERT(bio->bi_io_vec->bv_len == btrfs_inode_sectorsize(inode));
7999+
ASSERT(bio->bi_io_vec->bv_len == btrfs_inode_sectorsize(done->inode));
80068000

80078001
bio_for_each_segment_all(bvec, bio, i) {
80088002
ret = __readpage_endio_check(done->inode, io_bio, i,

0 commit comments

Comments
 (0)