• Darrick J. Wong's avatar
    xfs: harden directory integrity checks some more · 46c59736
    Darrick J. Wong authored
    If a malicious filesystem image contains a block+ format directory
    wherein the directory inode's core.mode is set such that
    S_ISDIR(core.mode) == 0, and if there are subdirectories of the
    corrupted directory, an attempt to traverse up the directory tree will
    crash the kernel in __xfs_dir3_data_check.  Running the online scrub's
    parent checks will tend to do this.
    
    The crash occurs because the directory inode's d_ops get set to
    xfs_dir[23]_nondir_ops (it's not a directory) but the parent pointer
    scrubber's indiscriminate call to xfs_readdir proceeds past the ASSERT
    if we have non fatal asserts configured.
    
    Fix the null pointer dereference crash in __xfs_dir3_data_check by
    looking for S_ISDIR or wrong d_ops; and teach the parent scrubber
    to bail out if it is fed a non-directory "parent".
    Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
    Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
    46c59736
xfs_dir2_data.c 31.4 KB