summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2020-09-25 14:53:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-30 10:38:29 +0100
commitc33948e7f5295fb18797080507b2c7f2bab323f9 (patch)
tree8d63afa5d44b952873353b046758ce1fe0e81724
parentcedb0187b8ba929c3f76f28e6bc25804d65f8a54 (diff)
downloadlinux-stable-c33948e7f5295fb18797080507b2c7f2bab323f9.tar.gz
linux-stable-c33948e7f5295fb18797080507b2c7f2bab323f9.tar.bz2
linux-stable-c33948e7f5295fb18797080507b2c7f2bab323f9.zip
udf: Limit sparing table size
[ Upstream commit 44ac6b829c4e173fdf6df18e6dd86aecf9a3dc99 ] Although UDF standard allows it, we don't support sparing table larger than a single block. Check it during mount so that we don't try to access memory beyond end of buffer. Reported-by: syzbot+9991561e714f597095da@syzkaller.appspotmail.com Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/udf/super.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 1676a175cd7a..caeb01ca039b 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1349,6 +1349,12 @@ static int udf_load_sparable_map(struct super_block *sb,
(int)spm->numSparingTables);
return -EIO;
}
+ if (le32_to_cpu(spm->sizeSparingTable) > sb->s_blocksize) {
+ udf_err(sb, "error loading logical volume descriptor: "
+ "Too big sparing table size (%u)\n",
+ le32_to_cpu(spm->sizeSparingTable));
+ return -EIO;
+ }
for (i = 0; i < spm->numSparingTables; i++) {
loc = le32_to_cpu(spm->locSparingTable[i]);