| Message ID | CAMRmmpLUsC=L=4sUf09Gx97W1hvc2FoOMmqOydiZQ6XwumUoYQ@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Oct 26, 2012 at 12:12:24AM +0800, Rock Lee wrote: > Fix Bug to corrupt the img file > > Reproduce steps: > > dd if=/dev/zero of=btrfs-small.img bs=1M count=1 > > ls -lh btrfs-small.img > -rw-rw-r--. 1 rock rock 1.0M Oct 24 09:51 btrfs-small.img > ^^^ > > mkfs.btrfs btrfs-small.img > -rw-rw-r--. 1 rock rock 2.0M Oct 24 09:53 btrfs-small.img > ^^^ > > Here you can see the original img file's size goes larger to 2Mb. Thanks, fixes this particular bug; although it crashes later at mkfs.btrfs: volumes.c:796: btrfs_alloc_chunk: Assertion `!(ret)' failed but this is a separate issue and you've sent patches for that IIRC. > --- a/utils.c > +++ b/utils.c > @@ -557,6 +557,12 @@ int btrfs_prepare_device(int fd, char *file, int > zero_end, u64 *block_count_ret, > } > if (max_block_count) > block_count = min(block_count, max_block_count); > + > + if (block_count < 2 * 1024 * 1024) { > + fprintf(stderr, "size of %s is too small(less than > 2Mb)\n", file); line wrapped, please check your mailer (easy to fix but additional unnecessary work) > + exit(1); > + } > + Otherwise ack from me. david -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks for your review. Sorry for the problem line wrapped, I will resend the patch. Thanks -Rock 2012/10/26 David Sterba <dave@jikos.cz>: > On Fri, Oct 26, 2012 at 12:12:24AM +0800, Rock Lee wrote: >> Fix Bug to corrupt the img file >> >> Reproduce steps: >> > dd if=/dev/zero of=btrfs-small.img bs=1M count=1 >> > ls -lh btrfs-small.img >> -rw-rw-r--. 1 rock rock 1.0M Oct 24 09:51 btrfs-small.img >> ^^^ >> > mkfs.btrfs btrfs-small.img >> -rw-rw-r--. 1 rock rock 2.0M Oct 24 09:53 btrfs-small.img >> ^^^ >> >> Here you can see the original img file's size goes larger to 2Mb. > > Thanks, fixes this particular bug; although it crashes later at > > mkfs.btrfs: volumes.c:796: btrfs_alloc_chunk: Assertion `!(ret)' failed > > but this is a separate issue and you've sent patches for that IIRC. > >> --- a/utils.c >> +++ b/utils.c >> @@ -557,6 +557,12 @@ int btrfs_prepare_device(int fd, char *file, int >> zero_end, u64 *block_count_ret, >> } >> if (max_block_count) >> block_count = min(block_count, max_block_count); >> + >> + if (block_count < 2 * 1024 * 1024) { >> + fprintf(stderr, "size of %s is too small(less than >> 2Mb)\n", file); > > line wrapped, please check your mailer (easy to fix but additional > unnecessary work) > >> + exit(1); >> + } >> + > > Otherwise ack from me. > > david -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/utils.c b/utils.c index 205e667..7ba746e 100644 --- a/utils.c +++ b/utils.c @@ -557,6 +557,12 @@ int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret, } if (max_block_count) block_count = min(block_count, max_block_count); + + if (block_count < 2 * 1024 * 1024) { + fprintf(stderr, "size of %s is too small(less than 2Mb)\n", file); + exit(1); + } + zero_end = 1;