• Al Viro's avatar
    ext2: unbugger ext2_empty_dir() · 27e714c0
    Al Viro authored
    In 27cfa258 "ext2: fix fs corruption when trying to remove
    a non-empty directory with IO error" a funny thing has happened:
    
    -               page = ext2_get_page(inode, i, dir_has_error, &page_addr);
    +               page = ext2_get_page(inode, i, 0, &page_addr);
    
     -               if (IS_ERR(page)) {
     -                       dir_has_error = 1;
     -                       continue;
     -               }
     +               if (IS_ERR(page))
     +                       goto not_empty;
    
    And at not_empty: we hit ext2_put_page(page, page_addr), which does
    put_page(page).  Which, unless I'm very mistaken, should oops
    immediately when given ERR_PTR(-E...) as page.
    
    OK, shit happens, insufficiently tested patches included.  But when
    commit in question describes the fault-injection test that exercised
    that particular failure exit...
    
    Ow.
    
    CC: stable@vger.kernel.org
    Fixes: 27cfa258 ("ext2: fix fs corruption when trying to remove a non-empty directory with IO error")
    Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: default avatarJan Kara <jack@suse.cz>
    27e714c0
dir.c 18.2 KB