2009-05-01 08:47:12

by Nick Dokos

Subject: [PATCH 6/6][64-bit] __u32 -> __u64 in ba_resize_bmap() and blk_t -> blk64_t in ext2fs_check_desc()

Both of these were found by code inspection while chasing the
ext2fs_get_free_blocks2() problem. I have not seen a problem arising
from them, but they look like bugs to me.

Signed-off-by: Nick Dokos <[email protected]>
---
lib/ext2fs/blkmap64_ba.c | 2 +-
lib/ext2fs/check_desc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ext2fs/blkmap64_ba.c b/lib/ext2fs/blkmap64_ba.c
index f7f7097..b9e0e90 100644
--- a/lib/ext2fs/blkmap64_ba.c
+++ b/lib/ext2fs/blkmap64_ba.c
@@ -124,7 +124,7 @@ static errcode_t ba_resize_bmap(ext2fs_generic_bitmap64 bmap,
ext2fs_ba_private bp = (ext2fs_ba_private) bmap->private;
errcode_t retval;
size_t size, new_size;
- __u32 bitno;
+ __u64 bitno;

/*
* If we're expanding the bitmap, make sure all of the new
diff --git a/lib/ext2fs/check_desc.c b/lib/ext2fs/check_desc.c
index 6a969e0..e812c9f 100644
--- a/lib/ext2fs/check_desc.c
+++ b/lib/ext2fs/check_desc.c
@@ -36,7 +36,7 @@ errcode_t ext2fs_check_desc(ext2_filsys fs)
dgrp_t i;
blk64_t first_block = fs->super->s_first_data_block;
blk64_t last_block = ext2fs_blocks_count(fs->super)-1;
- blk_t blk, b;
+ blk64_t blk, b;
int j;

EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
--
1.6.0.6

2009-05-04 06:21:39

by Valerie Aurora

Subject: Re: [PATCH 6/6][64-bit] __u32 -> __u64 in ba_resize_bmap() and blk_t -> blk64_t in ext2fs_check_desc()

On Fri, May 01, 2009 at 04:47:26AM -0400, Nick Dokos wrote:
> Both of these were found by code inspection while chasing the
> ext2fs_get_free_blocks2() problem. I have not seen a problem arising
> from them, but they look like bugs to me.
>
> Signed-off-by: Nick Dokos <[email protected]>
> ---
> lib/ext2fs/blkmap64_ba.c | 2 +-
> lib/ext2fs/check_desc.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/ext2fs/blkmap64_ba.c b/lib/ext2fs/blkmap64_ba.c
> index f7f7097..b9e0e90 100644
> --- a/lib/ext2fs/blkmap64_ba.c
> +++ b/lib/ext2fs/blkmap64_ba.c
> @@ -124,7 +124,7 @@ static errcode_t ba_resize_bmap(ext2fs_generic_bitmap64 bmap,
> ext2fs_ba_private bp = (ext2fs_ba_private) bmap->private;
> errcode_t retval;
> size_t size, new_size;
> - __u32 bitno;
> + __u64 bitno;
>
> /*
> * If we're expanding the bitmap, make sure all of the new
> diff --git a/lib/ext2fs/check_desc.c b/lib/ext2fs/check_desc.c
> index 6a969e0..e812c9f 100644
> --- a/lib/ext2fs/check_desc.c
> +++ b/lib/ext2fs/check_desc.c
> @@ -36,7 +36,7 @@ errcode_t ext2fs_check_desc(ext2_filsys fs)
> dgrp_t i;
> blk64_t first_block = fs->super->s_first_data_block;
> blk64_t last_block = ext2fs_blocks_count(fs->super)-1;
> - blk_t blk, b;
> + blk64_t blk, b;
> int j;
>
> EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
> --
> 1.6.0.6
>

Signed-off-by: Valerie Aurora (Henson) <[email protected]>

-VAL