From: Pali Rohár Date: Thu, 9 Nov 2017 18:03:34 +0000 (+0100) Subject: libblkid: vfat: Fix reading labels which starts with byte 0x05 X-Git-Tag: v2.31.1~36 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8aa44f8dc7f8b4939fb40b790f3aff2b27861699;p=thirdparty%2Futil-linux.git libblkid: vfat: Fix reading labels which starts with byte 0x05 When FAT directory entry has leading byte 0x05 it is interpreted as byte 0xE5. This is how FAT stores file name which starts with byte 0xE5 as leading byte in 0xE5 in FAT directory entry means that file slot is empty. Fixes: #533 --- diff --git a/libblkid/src/superblocks/vfat.c b/libblkid/src/superblocks/vfat.c index 0cdd2bac7b..3aeba018aa 100644 --- a/libblkid/src/superblocks/vfat.c +++ b/libblkid/src/superblocks/vfat.c @@ -165,6 +165,8 @@ static unsigned char *search_fat_label(blkid_probe pr, if ((ent->attr & (FAT_ATTR_VOLUME_ID | FAT_ATTR_DIR)) == FAT_ATTR_VOLUME_ID) { DBG(LOWPROBE, ul_debug("\tfound fs LABEL at entry %d", i)); + if (ent->name[0] == 0x05) + ent->name[0] = 0xE5; return ent->name; } } diff --git a/tests/expected/blkid/low-probe-fat32_cp850_O_tilde b/tests/expected/blkid/low-probe-fat32_cp850_O_tilde new file mode 100644 index 0000000000..096bcbf2c1 --- /dev/null +++ b/tests/expected/blkid/low-probe-fat32_cp850_O_tilde @@ -0,0 +1,7 @@ +ID_FS_LABEL=___ +ID_FS_LABEL_ENC=\xe5\xe5\xe5 +ID_FS_TYPE=vfat +ID_FS_USAGE=filesystem +ID_FS_UUID=2826-F9B3 +ID_FS_UUID_ENC=2826-F9B3 +ID_FS_VERSION=FAT32 diff --git a/tests/ts/blkid/images-fs/fat32_cp850_O_tilde.img.xz b/tests/ts/blkid/images-fs/fat32_cp850_O_tilde.img.xz new file mode 100644 index 0000000000..06eb2c978e Binary files /dev/null and b/tests/ts/blkid/images-fs/fat32_cp850_O_tilde.img.xz differ