From: Karel Zak Date: Fri, 24 Mar 2017 10:46:33 +0000 (+0100) Subject: libblkid: fix typo X-Git-Tag: v2.30-rc1~164 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=044d6e556564f76b4ac3543cadb44b0cd48aa22d;p=thirdparty%2Futil-linux.git libblkid: fix typo Signed-off-by: Karel Zak --- diff --git a/libblkid/src/superblocks/hfs.c b/libblkid/src/superblocks/hfs.c index ef746d4e29..c2344114a8 100644 --- a/libblkid/src/superblocks/hfs.c +++ b/libblkid/src/superblocks/hfs.c @@ -244,6 +244,7 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag) leaf_node_head = be32_to_cpu(bnode->leaf_head); leaf_node_size = be16_to_cpu(bnode->node_size); leaf_node_count = be32_to_cpu(bnode->leaf_count); + if (leaf_node_size < sizeof(struct hfsplus_bnode_descriptor) + sizeof(struct hfsplus_catalog_key) || leaf_node_count == 0) return 0; @@ -286,7 +287,7 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag) &buf[sizeof(struct hfsplus_bnode_descriptor)]; if (be32_to_cpu(key->parent_id) != HFSPLUS_POR_CNID || - be16_to_cpu(key->unicode_len > 255)) + be16_to_cpu(key->unicode_len) > 255) return 0; blkid_probe_set_utf8label(pr, key->unicode,