mirror of
https://github.com/systemd/systemd.git
synced 2025-02-04 21:47:31 +03:00
volume_id: vfat - allow all possible sector sizes
https://bugs.launchpad.net/bugs/147807
This commit is contained in:
parent
6e9edde6c9
commit
424520043a
@ -310,7 +310,7 @@ magic:
|
||||
if (!vs->reserved)
|
||||
return -1;
|
||||
|
||||
/* fat count*/
|
||||
/* fat count */
|
||||
if (!vs->fats)
|
||||
return -1;
|
||||
|
||||
@ -318,15 +318,14 @@ magic:
|
||||
if (vs->media < 0xf8 && vs->media != 0xf0)
|
||||
return -1;
|
||||
|
||||
/* cluster size check*/
|
||||
/* cluster size check */
|
||||
if (vs->sectors_per_cluster == 0 ||
|
||||
(vs->sectors_per_cluster & (vs->sectors_per_cluster-1)))
|
||||
return -1;
|
||||
|
||||
/* sector size check */
|
||||
sector_size = le16_to_cpu(vs->sector_size);
|
||||
if (sector_size != 0x200 && sector_size != 0x400 &&
|
||||
sector_size != 0x800 && sector_size != 0x1000)
|
||||
if (sector_size == 0 || ((sector_size & (sector_size-1)) != 0))
|
||||
return -1;
|
||||
|
||||
dbg("sector_size 0x%x", sector_size);
|
||||
|
Loading…
x
Reference in New Issue
Block a user