From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Rustam Kovhaev <rkovhaev@gmail.com>,
syzbot+83b6f7cf9922cae5c4d7@syzkaller.appspotmail.com,
Jan Kara <jack@suse.cz>, Sasha Levin <sashal@kernel.org>,
reiserfs-devel@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 08/17] reiserfs: add check for an invalid ih_entry_count
Date: Wed, 30 Dec 2020 08:03:48 -0500 [thread overview]
Message-ID: <20201230130357.3637261-8-sashal@kernel.org> (raw)
In-Reply-To: <20201230130357.3637261-1-sashal@kernel.org>
From: Rustam Kovhaev <rkovhaev@gmail.com>
[ Upstream commit d24396c5290ba8ab04ba505176874c4e04a2d53c ]
when directory item has an invalid value set for ih_entry_count it might
trigger use-after-free or out-of-bounds read in bin_search_in_dir_item()
ih_entry_count * IH_SIZE for directory item should not be larger than
ih_item_len
Link: https://lore.kernel.org/r/20201101140958.3650143-1-rkovhaev@gmail.com
Reported-and-tested-by: syzbot+83b6f7cf9922cae5c4d7@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?extid=83b6f7cf9922cae5c4d7
Signed-off-by: Rustam Kovhaev <rkovhaev@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/reiserfs/stree.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index bb4973aefbb18..9e64e23014e8e 100644
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -454,6 +454,12 @@ static int is_leaf(char *buf, int blocksize, struct buffer_head *bh)
"(second one): %h", ih);
return 0;
}
+ if (is_direntry_le_ih(ih) && (ih_item_len(ih) < (ih_entry_count(ih) * IH_SIZE))) {
+ reiserfs_warning(NULL, "reiserfs-5093",
+ "item entry count seems wrong %h",
+ ih);
+ return 0;
+ }
prev_location = ih_location(ih);
}
--
2.27.0
next prev parent reply other threads:[~2020-12-30 13:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-30 13:03 [PATCH AUTOSEL 5.4 01/17] ARM: 9014/2: Replace string mem* functions for KASan Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 02/17] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 03/17] module: set MODULE_STATE_GOING state when a module fails to load Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 04/17] quota: Don't overflow quota file offsets Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 05/17] rtc: pl031: fix resource leak in pl031_probe Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 06/17] powerpc: sysdev: add missing iounmap() on error in mpic_msgr_probe() Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 07/17] i3c master: fix missing destroy_workqueue() on error in i3c_master_register Sasha Levin
2020-12-30 13:03 ` Sasha Levin [this message]
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 09/17] NFSv4: Fix a pNFS layout related use-after-free race when freeing the inode Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 10/17] f2fs: avoid race condition for shrinker count Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 11/17] module: delay kobject uevent until after module init call Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 12/17] f2fs: fix shift-out-of-bounds in sanity_check_raw_super() Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 13/17] fs/namespace.c: WARN if mnt_count has become negative Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 14/17] um: ubd: Submit all data segments atomically Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 15/17] tick/sched: Remove bogus boot "safety" check Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 16/17] ALSA: pcm: Clear the full allocated memory at hw_params Sasha Levin
2020-12-30 13:03 ` [PATCH AUTOSEL 5.4 17/17] dm verity: skip verity work if I/O error when system is shutting down Sasha Levin
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=20201230130357.3637261-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=reiserfs-devel@vger.kernel.org \
--cc=rkovhaev@gmail.com \
--cc=stable@vger.kernel.org \
--cc=syzbot+83b6f7cf9922cae5c4d7@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
Powered by JetHome