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

libblkid: vfat: Fix reading FAT32 boot label 

FAT32 can be formatted with boot sign 0x28 to indicate that only serial id
is present or with boot sign 0x29 which indicates that both boot label and
serial id is present.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
This commit is contained in:
Pali Rohár 2021-07-05 15:10:51 +02:00 committed by Karel Zak
parent 9c3b9269d9
commit ee3d6b0d4a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libblkid/src/superblocks/vfat.c
View File

@ -43,7 +43,9 @@ struct vfat_super_block {
/* 30*/ uint16_t vs_fsinfo_sector;
/* 32*/ uint16_t vs_backup_boot;
/* 34*/ uint16_t vs_reserved2[6];
/* 40*/ unsigned char vs_unknown[3];
/* 40*/ unsigned char vs_drive_number;
/* 41*/ unsigned char vs_boot_flags;
/* 42*/ unsigned char vs_ext_boot_sign; /* 0x28 - without vs_label/vs_magic; 0x29 - with */
/* 43*/ unsigned char vs_serno[4];
/* 47*/ unsigned char vs_label[11];
/* 52*/ unsigned char vs_magic[8];
@ -387,7 +389,9 @@ static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag)
version = "FAT32";
boot_label = vs->vs_label;
if (vs->vs_ext_boot_sign == 0x29)
boot_label = vs->vs_label;
vol_serno = vs->vs_serno;
/*