lkml.org 
[lkml]   [2017]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 067/104] Btrfs: fix segmentation fault when doing dio read
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Liu Bo <bo.li.liu@oracle.com>


    [ Upstream commit 97bf5a5589aa3a59c60aa775fc12ec0483fc5002 ]

    Commit 2dabb3248453 ("Btrfs: Direct I/O read: Work on sectorsized blocks")
    introduced this bug during iterating bio pages in dio read's endio hook,
    and it could end up with segment fault of the dio reading task.

    So the reason is 'if (nr_sectors--)', and it makes the code assume that
    there is one more block in the same page, so page offset is increased and
    the bio which is created to repair the bad block then has an incorrect
    bvec.bv_offset, and a later access of the page content would throw a
    segmentation fault.

    This also adds ASSERT to check page offset against page size.

    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>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/btrfs/inode.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/fs/btrfs/inode.c
    +++ b/fs/btrfs/inode.c
    @@ -8050,8 +8050,10 @@ next_block_or_try_again:

    start += sectorsize;

    - if (nr_sectors--) {
    + nr_sectors--;
    + if (nr_sectors) {
    pgoff += sectorsize;
    + ASSERT(pgoff < PAGE_SIZE);
    goto next_block_or_try_again;
    }
    }
    @@ -8157,8 +8159,10 @@ next:

    ASSERT(nr_sectors);

    - if (--nr_sectors) {
    + nr_sectors--;
    + if (nr_sectors) {
    pgoff += sectorsize;
    + ASSERT(pgoff < PAGE_SIZE);
    goto next_block;
    }
    }

    \
     
     \ /
      Last update: 2017-10-06 11:14    [W:2.232 / U:18.368 seconds]
    ©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site