summaryrefslogtreecommitdiff
path: root/lib/ext2fs/check_desc.c
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-06-12 12:07:34 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2014-06-12 12:07:34 +0100
commit485edc675200ff3097cec521c357441a1c2d9b0d (patch)
tree7edee2fc5e1fb60caa90f3bb26b1becde9691b99 /lib/ext2fs/check_desc.c
parent1ab0ea88057e922a89c6b8feebeb62c57e40f8de (diff)
parent5f4b406b03dc9fa27c78184df5b1d501e373ca01 (diff)
downloade2fsprogs-baserock/morph.tar.gz
Merge 'baserock/richardmaw/yakshave/util-linux-blkid' into baserock/morphbaserock/morph
Reviewed-by: Lars Wirzenius Reviewed-by: Sam Thursfield
Diffstat (limited to 'lib/ext2fs/check_desc.c')
-rw-r--r--lib/ext2fs/check_desc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ext2fs/check_desc.c b/lib/ext2fs/check_desc.c
index a6fcc454..1a768f92 100644
--- a/lib/ext2fs/check_desc.c
+++ b/lib/ext2fs/check_desc.c
@@ -42,6 +42,9 @@ errcode_t ext2fs_check_desc(ext2_filsys fs)
EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
+ if (EXT2_DESC_SIZE(fs->super) & (EXT2_DESC_SIZE(fs->super) - 1))
+ return EXT2_ET_BAD_DESC_SIZE;
+
retval = ext2fs_allocate_subcluster_bitmap(fs, "check_desc map", &bmap);
if (retval)
return retval;