d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not overflow when calculating file system size.

Browse Source 
Reported by:		Hyeongseok Kim <hyeongseok kim lge com>
Reviewed by:		cem, Hyeongseok Kim
MFC after:		3 days
Differential Revision:	https://reviews.freebsd.org/D24603
This commit is contained in:
delphij 2020-04-28 05:10:34 +00:00
parent a42b79f246
commit 2ccadef77b
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sbin/fsck_msdosfs/check.c
View File

@ -54,6 +54,8 @@ checkfilesys(const char *fname)
int finish_dosdirsection=0;
int mod = 0;
int ret = 8;
int64_t freebytes;
int64_t badbytes;
rdonly = alwaysno;
if (!preen)
@ -129,37 +131,33 @@ checkfilesys(const char *fname)
mod |= FSERROR;
}
freebytes = (int64_t)boot.NumFree * boot.ClusterSize;
badbytes = (int64_t)boot.NumBad * boot.ClusterSize;
#ifdef HAVE_LIBUTIL_H
char freestr[7], badstr[7];
int64_t freebytes = boot.NumFree * boot.ClusterSize;
humanize_number(freestr, sizeof(freestr), freebytes, "",
HN_AUTOSCALE, HN_DECIMAL | HN_IEC_PREFIXES);
if (boot.NumBad) {
int64_t badbytes = boot.NumBad * boot.ClusterSize;
humanize_number(badstr, sizeof(badstr), badbytes, "",
HN_AUTOSCALE, HN_B | HN_DECIMAL | HN_IEC_PREFIXES);
pwarn("%d files, %sB free (%d clusters), %sB bad (%d clusters)\n",
boot.NumFiles,
freestr, boot.NumFree,
boot.NumFiles, freestr, boot.NumFree,
badstr, boot.NumBad);
} else {
pwarn("%d files, %sB free (%d clusters)\n",
boot.NumFiles,
freestr, boot.NumFree);
boot.NumFiles, freestr, boot.NumFree);
}
#else
if (boot.NumBad)
pwarn("%d files, %d KiB free (%d clusters), %d KiB bad (%d clusters)\n",
boot.NumFiles,
boot.NumFree * boot.ClusterSize / 1024, boot.NumFree,
boot.NumBad * boot.ClusterSize / 1024, boot.NumBad);
pwarn("%d files, %jd KiB free (%d clusters), %jd KiB bad (%d clusters)\n",
boot.NumFiles, (intmax_t)freebytes / 1024, boot.NumFree,
(intmax_t)badbytes / 1024, boot.NumBad);
else
pwarn("%d files, %d KiB free (%d clusters)\n",
boot.NumFiles,
boot.NumFree * boot.ClusterSize / 1024, boot.NumFree);
pwarn("%d files, %jd KiB free (%d clusters)\n",
boot.NumFiles, (intmax_t)freebytes / 1024, boot.NumFree);
#endif
if (mod && (mod & FSERROR) == 0) {