summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAmir Goldstein <amir73il@gmail.com>2017-01-17 11:41:44 -0800
committerDarrick J. Wong <darrick.wong@oracle.com>2017-01-17 11:42:22 -0800
commita324cbf10a3c67aaa10c9f47f7b5801562925bc2 (patch)
tree34d10d7b82bf5e68df6b59c77ffa48d4624fa80d /fs
parentfab8eef86c814c3dd46bc5d760b6e4a53d5fc5a6 (diff)
downloadlinux-stable-a324cbf10a3c67aaa10c9f47f7b5801562925bc2.tar.gz
linux-stable-a324cbf10a3c67aaa10c9f47f7b5801562925bc2.tar.bz2
linux-stable-a324cbf10a3c67aaa10c9f47f7b5801562925bc2.zip
xfs: sanity check inode di_mode
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/libxfs/xfs_inode_buf.c3
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 0091ac3f5241..d93f9d918cfc 100644
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -29,6 +29,7 @@
#include "xfs_icache.h"
#include "xfs_trans.h"
#include "xfs_ialloc.h"
+#include "xfs_dir2.h"
/*
* Check that none of the inode's in the buffer have a next
@@ -398,6 +399,8 @@ xfs_dinode_verify(
return false;
mode = be16_to_cpu(dip->di_mode);
+ if (mode && xfs_mode_to_ftype(mode) == XFS_DIR3_FT_UNKNOWN)
+ return false;
/* No zero-length symlinks/dirs. */
if ((S_ISLNK(mode) || S_ISDIR(mode)) && dip->di_size == 0)