diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-27 17:00:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-27 17:00:35 -0800 |
| commit | e01799ac56306ab211f2edf1221a82dc57eab8f5 (patch) | |
| tree | 2a5fd6e8885d397fdf7fbfa817bd13b6c5d8a9e9 /fs/udf | |
| parent | 4b0a383ad782d6028becea7602968d49a83ff5fc (diff) | |
| parent | 41c4f85cdac280d356df1f483000ecec4a8868be (diff) | |
| download | linux-e01799ac56306ab211f2edf1221a82dc57eab8f5.tar.bz2 | |
Merge tag 'fs_for_4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext2, udf, and quota update from Jan Kara:
"Some ext2 cleanups, a fix for UDF crash on corrupted media, and one
quota locking fix"
* tag 'fs_for_4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
quota: Lock s_umount in exclusive mode for Q_XQUOTA{ON,OFF} quotactls.
udf: Fix BUG on corrupted inode
ext2: change reusable parameter to true when calling mb_cache_entry_create()
ext2: remove redundant condition check
ext2: avoid unnecessary operation in ext2_error()
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/inode.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 5df554a9f9c9..ae796e10f68b 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1357,6 +1357,12 @@ reread: iinfo->i_alloc_type = le16_to_cpu(fe->icbTag.flags) & ICBTAG_FLAG_AD_MASK; + if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_SHORT && + iinfo->i_alloc_type != ICBTAG_FLAG_AD_LONG && + iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) { + ret = -EIO; + goto out; + } iinfo->i_unique = 0; iinfo->i_lenEAttr = 0; iinfo->i_lenExtents = 0; |