ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libblkid/minix: Match minix superblock types 

All of the types in the minix super block are unsigned but in
probe_minix they were being treated as signed. This would cause some of
the extra sanity checks to pass on a non minix device. The types were
updated to match the return types of the helper functions in
disk-utils/minix_programs.h

This can be checked by creating a swap partition with one of these UUIDs
35f1f264-2468-471a-bc85-acc9f4bc04a3
35f1f264-6824-471a-bc85-acc9f4bc04a3
35f1f264-2478-471a-bc85-acc9f4bc04a3
35f1f264-7824-471a-bc85-acc9f4bc04a3

Prior to this change they would all be considered minix and swap by
blkid.

Signed-off-by: Nate Clark <nate@neworld.us>
This commit is contained in:
Nate Clark 2017-01-04 15:24:22 -05:00
parent 63dc575be3
commit a9975c1072
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libblkid/src/superblocks/minix.c
View File

@ -89,7 +89,8 @@ static int probe_minix(blkid_probe pr,
if (version <= 2) {
struct minix_super_block *sb = (struct minix_super_block *) data;
int zones, ninodes, imaps, zmaps, firstz;
unsigned long zones, ninodes, imaps, zmaps;
off_t firstz;
if (sb->s_imap_blocks == 0 || sb->s_zmap_blocks == 0 ||
sb->s_log_zone_size != 0)