From: Nate Clark Date: Wed, 4 Jan 2017 20:21:17 +0000 (-0500) Subject: libblkid/minix: Sanity check superblock s_state for v 1 and 2 X-Git-Tag: v2.30-rc1~316^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=892553b1a41b449f58462f123eca2bf2c6c56b33;p=thirdparty%2Futil-linux.git libblkid/minix: Sanity check superblock s_state for v 1 and 2 Swap devices with specific values in the uuid can look like minix devices to blkid. Add an extra check to make sure the state of the filesystem has valid state flags. A couple of offending swap uuids include: 35f1f264-137f-471a-bc85-acc9f4bc04a3 35f1f264-7f13-471a-bc85-acc9f4bc04a3 35f1f264-138f-471a-bc85-acc9f4bc04a3 35f1f264-8f13-471a-bc85-acc9f4bc04a3 Without this change a swap device with any of those uuids would be detected as minix and swap by blkid. Signed-off-by: Nate Clark --- diff --git a/libblkid/src/superblocks/minix.c b/libblkid/src/superblocks/minix.c index 3e126e0ea3..feebc96adc 100644 --- a/libblkid/src/superblocks/minix.c +++ b/libblkid/src/superblocks/minix.c @@ -94,6 +94,10 @@ static int probe_minix(blkid_probe pr, if (version <= 2) { struct minix_super_block *sb = (struct minix_super_block *) data; + uint16_t state = minix_swab16(swabme, sb->s_state); + if ((state & (MINIX_VALID_FS | MINIX_ERROR_FS)) != state) + return 1; + zones = version == 2 ? minix_swab32(swabme, sb->s_zones) : minix_swab16(swabme, sb->s_nzones); ninodes = minix_swab16(swabme, sb->s_ninodes);