From 4828bbe9e7380da0d9153109ab290e88b5d53bf5 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 5 Feb 2010 22:25:03 -0500 Subject: [PATCH] resize2fs: Fix fix uninit group test accessing invalid memory Commit 74128f8 added tests for uninit groups, but it could access past the end of the group_desc[] array after processing the last group: ==19668== Invalid read of size 2 ==19668== at 0x40518C: resize_fs (resize2fs.c:1824) ==19668== by 0x405A46: main (main.c:451) ==19668== Address 0x5a0d002 is not stack'd, malloc'd or (recently) free'd ==19668== ==19668== Invalid read of size 2 ==19668== at 0x405391: resize_fs (resize2fs.c:1864) ==19668== by 0x405A46: main (main.c:451) ==19668== Address 0x5a0d002 is not stack'd, malloc'd or (recently) free'd ==19668== It was found by Eric Sandeen running the regression suite through valgrind. Signed-off-by: "Theodore Ts'o" --- resize/resize2fs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resize/resize2fs.c b/resize/resize2fs.c index 75c4721e5..346fd5399 100644 --- a/resize/resize2fs.c +++ b/resize/resize2fs.c @@ -1819,6 +1819,8 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs) group_free; ext2fs_group_desc_csum_set(fs, group); group++; + if (group >= fs->group_desc_count) + break; count = 0; group_free = 0; uninit = (fs->group_desc[group].bg_flags & @@ -1859,6 +1861,8 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs) group_free; ext2fs_group_desc_csum_set(fs, group); group++; + if (group >= fs->group_desc_count) + break; count = 0; group_free = 0; uninit = (fs->group_desc[group].bg_flags & -- 2.39.2