summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara2018-12-12 14:29:20 +0100
committerGreg Kroah-Hartman2019-02-12 19:47:09 +0100
commit6a1d712b43811fa2992b56108a633531406eac48 (patch)
tree7eda710b633cfc7082a12785f6dba3535a178f2a /fs
parentmlxsw: spectrum_acl: Limit priority value (diff)
downloadkernel-qcow2-linux-6a1d712b43811fa2992b56108a633531406eac48.tar.gz
kernel-qcow2-linux-6a1d712b43811fa2992b56108a633531406eac48.tar.xz
kernel-qcow2-linux-6a1d712b43811fa2992b56108a633531406eac48.zip
udf: Fix BUG on corrupted inode
[ Upstream commit d288d95842f1503414b7eebce3773bac3390457e ] When inode is corrupted so that extent type is invalid, some functions (such as udf_truncate_extents()) will just BUG. Check that extent type is valid when loading the inode to memory. Reported-by: Anatoly Trosinenko <anatoly.trosinenko@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/udf/inode.c6
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;