kevin/linux
1
Fork 0
Code

udf: fix uninit-value use in udf_get_fileshortad

Browse Source 
Check for overflow when computing alen in udf_current_aext to mitigate
later uninit-value use in udf_get_fileshortad KMSAN bug[1].
After applying the patch reproducer did not trigger any issue[2].

[1] https://syzkaller.appspot.com/bug?extid=8901c4560b7ab5c2f9df
[2] https://syzkaller.appspot.com/x/log.txt?x=10242227980000

Reported-by: syzbot+8901c4560b7ab5c2f9df@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=8901c4560b7ab5c2f9df
Tested-by: syzbot+8901c4560b7ab5c2f9df@syzkaller.appspotmail.com
Suggested-by: Jan Kara <jack@suse.com>
Signed-off-by: Gianfranco Trad <gianf.trad@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20240925074613.8475-3-gianf.trad@gmail.com
This commit is contained in:
Gianfranco Trad 2024-09-25 09:46:15 +02:00 committed by Jan Kara
parent c226964ec7
commit 264db9d666
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/udf/inode.c
View File

@ -2255,12 +2255,15 @@ int udf_current_aext(struct inode *inode, struct extent_position *epos,
alen = udf_file_entry_alloc_offset(inode) + alen = udf_file_entry_alloc_offset(inode) +
iinfo->i_lenAlloc; iinfo->i_lenAlloc;
} else { } else {
struct allocExtDesc *header =
(struct allocExtDesc *)epos->bh->b_data;
if (!epos->offset) if (!epos->offset)
epos->offset = sizeof(struct allocExtDesc); epos->offset = sizeof(struct allocExtDesc);
ptr = epos->bh->b_data + epos->offset; ptr = epos->bh->b_data + epos->offset;
alen = sizeof(struct allocExtDesc) + if (check_add_overflow(sizeof(struct allocExtDesc),
le32_to_cpu(((struct allocExtDesc *)epos->bh->b_data)-> le32_to_cpu(header->lengthAllocDescs), &alen))
lengthAllocDescs); return -1;
} }
switch (iinfo->i_alloc_type) { switch (iinfo->i_alloc_type) {