diff options
| author | Alexander Kurz <akurz@blala.de> | 2018-12-24 10:16:42 +0000 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-04 08:21:31 +0100 |
| commit | 83842b8174515db446a33fda788b6df68a74bc09 (patch) | |
| tree | 168a15bf747c7f68135cb9c23e18b1825184a4e4 /fs/fat | |
| parent | 0835bab7e51bb1d4db6e5210ffa82cf5a28cd5c4 (diff) | |
| download | barebox-83842b8174515db446a33fda788b6df68a74bc09.tar.gz barebox-83842b8174515db446a33fda788b6df68a74bc09.tar.xz | |
fs/fat: fix FAT32 detection
Limits for the number of clusters were used to determine the FAT fs type.
This fails e.g. for FAT32 fs with low cluster number that can be found
in certain Android images.
Sync the FAT fs type detection to the method used in linux by checking
the sectors/FAT entries at offset 0x16 (must be zero for FAT32) and offset
0x24 (must be non-zero for FAT32).
Signed-off-by: Alexander Kurz <akurz@blala.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs/fat')
| -rw-r--r-- | fs/fat/ff.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/fat/ff.c b/fs/fat/ff.c index 33f8b6195d..ba4adfc133 100644 --- a/fs/fat/ff.c +++ b/fs/fat/ff.c @@ -1591,9 +1591,14 @@ static int chk_mounted ( /* 0(0): successful, !=0: any error occurred */ return -EINVAL; /* Number of sectors per FAT */ + fmt = FS_FAT12; fasize = LD_WORD(fs->win+BPB_FATSz16); - if (!fasize) + if (!fasize) { fasize = LD_DWORD(fs->win+BPB_FATSz32); + if (fasize) + /* Must be FAT32 */ + fmt = FS_FAT32; + } fs->fsize = fasize; /* Number of FAT copies */ @@ -1633,11 +1638,8 @@ static int chk_mounted ( /* 0(0): successful, !=0: any error occurred */ nclst = (tsect - sysect) / fs->csize; if (!nclst) return -EINVAL; /* (Invalid volume size) */ - fmt = FS_FAT12; - if (nclst >= MIN_FAT16) + if (fmt == FS_FAT12 && nclst >= MIN_FAT16) fmt = FS_FAT16; - if (nclst >= MIN_FAT32) - fmt = FS_FAT32; /* Boundaries and Limits */ /* Number of FAT entries */ |