From: Gianfranco Trad <gianf.trad@gmail.com>
To: jack@suse.com
Cc: linux-kernel@vger.kernel.org, skhan@linuxfoundation.org,
syzbot+8901c4560b7ab5c2f9df@syzkaller.appspotmail.com,
Gianfranco Trad <gianf.trad@gmail.com>
Subject: [PATCH v2] udf: fix uninit-value use in udf_get_fileshortad
Date: Wed, 25 Sep 2024 09:46:15 +0200 [thread overview]
Message-ID: <20240925074613.8475-3-gianf.trad@gmail.com> (raw)
In-Reply-To: <20240925071355.t4w3thcfvfpou7gu@quack3>
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>
---
Notes:
changes in v2:
- use check_add_overflow helper to check for overflow.
link to v1: https://lore.kernel.org/all/20240919195227.412583-1-gianf.trad@gmail.com/T/
fs/udf/inode.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 4726a4d014b6..811a035b600f 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -2215,9 +2215,10 @@ int8_t udf_current_aext(struct inode *inode, struct extent_position *epos,
if (!epos->offset)
epos->offset = sizeof(struct allocExtDesc);
ptr = epos->bh->b_data + epos->offset;
- alen = sizeof(struct allocExtDesc) +
- le32_to_cpu(((struct allocExtDesc *)epos->bh->b_data)->
- lengthAllocDescs);
+ if (check_add_overflow(sizeof(struct allocExtDesc),
+ le32_to_cpu(((struct allocExtDesc *)epos->bh->b_data)
+ ->lengthAllocDescs), &alen))
+ return -1;
}
switch (iinfo->i_alloc_type) {
--
2.43.0
next parent reply other threads:[~2024-09-25 7:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240925071355.t4w3thcfvfpou7gu@quack3>
2024-09-25 7:46 ` Gianfranco Trad [this message]
2024-10-02 12:29 ` [PATCH v2] udf: fix uninit-value use in udf_get_fileshortad Jan Kara
2024-10-03 20:04 ` Gianfranco Trad
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240925074613.8475-3-gianf.trad@gmail.com \
--to=gianf.trad@gmail.com \
--cc=jack@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=syzbot+8901c4560b7ab5c2f9df@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox