51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
(submitted to list)
|
|
|
|
[PATCH] libext2fs: copy cluster_bits in ext2fs_copy_generic_bmap
|
|
|
|
The f_lotsbad regression test was failing on some systems
|
|
with:
|
|
|
|
@@ -26,6 +61,7 @@
|
|
|
|
Restarting e2fsck from the beginning...
|
|
Pass 1: Checking inodes, blocks, and sizes
|
|
+Illegal block number passed to ext2fs_test_block_bitmap #0 for in-use block map
|
|
Pass 2: Checking directory structure
|
|
Entry 'termcap' in / (2) has deleted/unused inode 12. Clear? yes
|
|
|
|
Running with valgrind (./test_script --valgrind f_lotsbad) we
|
|
see:
|
|
|
|
+==31409== Conditional jump or move depends on uninitialised value(s)
|
|
+==31409== at 0x42927A: ext2fs_test_generic_bmap (gen_bitmap64.c:378)
|
|
|
|
among others.
|
|
|
|
Looking at gen_bitmap64.c:
|
|
376: arg >>= bitmap->cluster_bits;
|
|
377:
|
|
378: if ((arg < bitmap->start) || (arg > bitmap->end)) {
|
|
|
|
A little more debugging showed that it was actually
|
|
bitmap->cluster_bits which was uninitialized, because it never
|
|
gets copied over in ext2fs_copy_generic_bmap()
|
|
|
|
Patch below resolves the issue.
|
|
|
|
Reported-by: Andreas Dilger <adilger@whamcloud.com>
|
|
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
|
---
|
|
|
|
Index: e2fsprogs-1.42/lib/ext2fs/gen_bitmap64.c
|
|
===================================================================
|
|
--- e2fsprogs-1.42.orig/lib/ext2fs/gen_bitmap64.c
|
|
+++ e2fsprogs-1.42/lib/ext2fs/gen_bitmap64.c
|
|
@@ -193,6 +193,7 @@ errcode_t ext2fs_copy_generic_bmap(ext2f
|
|
new_bmap->real_end = src->real_end;
|
|
new_bmap->bitmap_ops = src->bitmap_ops;
|
|
new_bmap->base_error_code = src->base_error_code;
|
|
+ new_bmap->cluster_bits = src->cluster_bits;
|
|
|
|
descr = src->description;
|
|
if (descr) {
|