* [PATCH] reiserfs: add check for an invalid ih_entry_count
@ 2020-11-01 14:09 Rustam Kovhaev
2020-11-26 15:57 ` Jan Kara
0 siblings, 1 reply; 2+ messages in thread
From: Rustam Kovhaev @ 2020-11-01 14:09 UTC (permalink / raw)
To: alex.shi, jack, akpm, yeyunfeng
Cc: reiserfs-devel, linux-kernel, gregkh, Rustam Kovhaev
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
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>
---
fs/reiserfs/stree.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 8bf88d690729..476a7ff49482 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.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] reiserfs: add check for an invalid ih_entry_count
2020-11-01 14:09 [PATCH] reiserfs: add check for an invalid ih_entry_count Rustam Kovhaev
@ 2020-11-26 15:57 ` Jan Kara
0 siblings, 0 replies; 2+ messages in thread
From: Jan Kara @ 2020-11-26 15:57 UTC (permalink / raw)
To: Rustam Kovhaev
Cc: alex.shi, jack, akpm, yeyunfeng, reiserfs-devel, linux-kernel, gregkh
On Sun 01-11-20 06:09:58, Rustam Kovhaev wrote:
> 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
>
> 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>
Thanks! I've added the patch to my tree and will push it to Linus.
Honza
> ---
> fs/reiserfs/stree.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
> index 8bf88d690729..476a7ff49482 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.28.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-26 15:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-01 14:09 [PATCH] reiserfs: add check for an invalid ih_entry_count Rustam Kovhaev
2020-11-26 15:57 ` Jan Kara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).