Page MenuHomeFreeBSD

sbin/fsck_msdosfs: Correct off-by-two issue when determining FAT type.
ClosedPublic

Authored by delphij on Jan 8 2020, 8:56 AM.
Tags
None
Referenced Files
F163387053: D23082.id66610.diff
Wed, Jul 22, 6:15 PM
Unknown Object (File)
Sun, Jul 12, 9:10 PM
Unknown Object (File)
Sat, Jul 11, 8:50 AM
Unknown Object (File)
Fri, Jul 10, 12:14 AM
Unknown Object (File)
Sat, Jul 4, 7:36 AM
Unknown Object (File)
Tue, Jun 30, 11:58 AM
Unknown Object (File)
Tue, Jun 30, 6:21 AM
Unknown Object (File)
Mon, Jun 29, 8:31 PM
Subscribers

Details

Summary

Correct off-by-two issue when determining FAT type.

In the code we used NumClusters as the upper (non-inclusive) boundary
of valid cluster number, so the actual value was 2 (CLUST_FIRST) more
than the real number of clusters. This causes a FAT16 media with
65524 clusters be treated as FAT32 and might affect FAT12 media with
4084 clusters as well.

To fix this, we increment NumClusters by CLUST_FIRST after the type
determination.

PR: 243179

Test Plan

Create FAT16 media on a 2GiB storage and run fsck_msdosfs

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 28536
Build 26589: arc lint + arc unit

Event Timeline

Sync with NetBSD which added more boundary checks.

Reduce the patch back to original (NetBSD sync was merged).

This revision was not accepted when it landed; it landed in state Needs Review.Jan 11 2020, 5:41 PM
This revision was automatically updated to reflect the committed changes.