dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 22:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

volume_id: fat - move check for msdos signature (0x55 0xaa)

Browse Source 
Make the msdos signature (0x55 0xaa) at 510 and 511 optional when
the standard FAT magic string is present.
This commit is contained in:
Karel Zak
2008-11-13 17:32:14 +01:00
committed by Kay Sievers
parent 1d36813d4c
commit 3e39ff6365
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extras/volume_id/lib/fat.c
View File

@@ -281,10 +281,6 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size)
if (buf == NULL)
return -1;
/* check signature */
if (buf[510] != 0x55 || buf[511] != 0xaa)
return -1;
vs = (struct vfat_super_block *) buf;
if (memcmp(vs->sysid, "NTFS", 4) == 0)
return -1;
@@ -305,6 +301,10 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size)
if (memcmp(vs->type.fat.magic, "FAT12 ", 8) == 0)
goto magic;
/* check signature */
if (buf[510] != 0x55 || buf[511] != 0xaa)
return -1;
/* some old floppies don't have a magic, expect the boot jump address to match */
if ((vs->boot_jump[0] != 0xeb || vs->boot_jump[2] != 0x90) &&
vs->boot_jump[0] != 0xe9)