diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2017-11-27 21:40:19 -0800 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2017-11-30 08:43:52 -0800 |
| commit | 3b42d385753c22b29d259ccb9d4c3f419e583b30 (patch) | |
| tree | 53e0c6b8ae3e364dc1e4f91a151f20998bbb927c /fs | |
| parent | 2d5f4b5bebccfe983715ebc9255151e611234643 (diff) | |
| download | linux-stable-3b42d385753c22b29d259ccb9d4c3f419e583b30.tar.gz linux-stable-3b42d385753c22b29d259ccb9d4c3f419e583b30.tar.bz2 linux-stable-3b42d385753c22b29d259ccb9d4c3f419e583b30.zip | |
xfs: scrub inode mode properly
Since we've used up all the bits in i_mode, the existing mode check
doesn't actually do anything useful. However, we've not used all the
bit values in the format portion of i_mode, so we /do/ need to test
that for bad values.
Fixes: 80e4e1268 ("xfs: scrub inodes")
Fixes-coverity-id: 1423992
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/scrub/inode.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/fs/xfs/scrub/inode.c b/fs/xfs/scrub/inode.c index 637b7a892313..f120fb20452f 100644 --- a/fs/xfs/scrub/inode.c +++ b/fs/xfs/scrub/inode.c @@ -318,8 +318,20 @@ xfs_scrub_dinode( /* di_mode */ mode = be16_to_cpu(dip->di_mode); - if (mode & ~(S_IALLUGO | S_IFMT)) + switch (mode & S_IFMT) { + case S_IFLNK: + case S_IFREG: + case S_IFDIR: + case S_IFCHR: + case S_IFBLK: + case S_IFIFO: + case S_IFSOCK: + /* mode is recognized */ + break; + default: xfs_scrub_ino_set_corrupt(sc, ino, bp); + break; + } /* v1/v2 fields */ switch (dip->di_version) { |