From: Timo Warns Date: Fri, 6 May 2011 09:04:24 +0000 (+0200) Subject: libblkid: validate hfs blocksize != 0 X-Git-Tag: v2.20-rc1~295 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b61b85c7d9a229e567e2e0b126e3e47c8caacb91;p=thirdparty%2Futil-linux.git libblkid: validate hfs blocksize != 0 Validate that blocksize != 0 as a blocksize == 0 can cause a division-by-zero error. Signed-off-by: Timo Warns --- diff --git a/shlibs/blkid/src/superblocks/hfs.c b/shlibs/blkid/src/superblocks/hfs.c index aa9da0ce66..a03ee4851b 100644 --- a/shlibs/blkid/src/superblocks/hfs.c +++ b/shlibs/blkid/src/superblocks/hfs.c @@ -225,6 +225,9 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag) hfs_set_uuid(pr, hfsplus->finder_info.id, sizeof(hfsplus->finder_info.id)); blocksize = be32_to_cpu(hfsplus->blocksize); + if (blocksize == 0) + return 0; + memcpy(extents, hfsplus->cat_file.extents, sizeof(extents)); cat_block = be32_to_cpu(extents[0].start_block);