diff options
author | Amir Goldstein <amir73il@gmail.com> | 2017-02-02 02:56:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-04 03:47:12 -0500 |
commit | d3201a14b36ae6ffb36b6b830e216f0ae4ebc184 (patch) | |
tree | c60da2260b576750031661c9050ce424ae51a174 /fs | |
parent | 43ce5921773b827531ed123016625481d43c2bd9 (diff) |
xfs: sanity check inode di_mode
commit a324cbf10a3c67aaa10c9f47f7b5801562925bc2 upstream.
Check for invalid file type in xfs_dinode_verify()
and fail to load the inode structure from disk.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/xfs/libxfs/xfs_inode_buf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index 977245de8953..37ee7f01a35d 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "xfs_icache.h" | 29 | #include "xfs_icache.h" |
30 | #include "xfs_trans.h" | 30 | #include "xfs_trans.h" |
31 | #include "xfs_ialloc.h" | 31 | #include "xfs_ialloc.h" |
32 | #include "xfs_dir2.h" | ||
32 | 33 | ||
33 | /* | 34 | /* |
34 | * Check that none of the inode's in the buffer have a next | 35 | * Check that none of the inode's in the buffer have a next |
@@ -398,6 +399,8 @@ xfs_dinode_verify( | |||
398 | return false; | 399 | return false; |
399 | 400 | ||
400 | mode = be16_to_cpu(dip->di_mode); | 401 | mode = be16_to_cpu(dip->di_mode); |
402 | if (mode && xfs_mode_to_ftype(mode) == XFS_DIR3_FT_UNKNOWN) | ||
403 | return false; | ||
401 | 404 | ||
402 | /* No zero-length symlinks/dirs. */ | 405 | /* No zero-length symlinks/dirs. */ |
403 | if ((S_ISLNK(mode) || S_ISDIR(mode)) && dip->di_size == 0) | 406 | if ((S_ISLNK(mode) || S_ISDIR(mode)) && dip->di_size == 0) |