diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-23 17:07:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-23 17:07:36 +0000 |
commit | 7d208f286e34d5ac936054fd53edd53d1eacacb2 (patch) | |
tree | 2f42e0a6005555f8268146a70e056467dafea60c | |
parent | ba8cb29526bc674b357879ad1daa1893b3655758 (diff) | |
parent | c4caef411a910625812e6984b1c2e1951aaf42fe (diff) | |
download | fsck_msdos-7d208f286e34d5ac936054fd53edd53d1eacacb2.tar.gz |
Merge "Sync with upstream 667eef4ac (svn revision 366064 + 366065)." am: b86e97b62c am: a1c9005dc8 am: c6bf77e339 am: c4caef411a
Original change: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/1434752
Change-Id: I78bab79efc1361f9164c5e3757db15f9723a9dee
-rw-r--r-- | dir.c | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -388,7 +388,8 @@ static int checksize(struct fat_descriptor *fat, u_char *p, struct dosDirEntry *dir) { int ret = FSOK; - size_t physicalSize; + size_t chainsize; + u_int64_t physicalSize; struct bootblock *boot; boot = fat_get_boot(fat); @@ -401,9 +402,9 @@ checksize(struct fat_descriptor *fat, u_char *p, struct dosDirEntry *dir) } else { if (!fat_is_valid_cl(fat, dir->head)) return FSERROR; - ret = checkchain(fat, dir->head, &physicalSize); + ret = checkchain(fat, dir->head, &chainsize); /* - * Upon return, physicalSize would hold the chain length + * Upon return, chainsize would hold the chain length * that checkchain() was able to validate, but if the user * refused the proposed repair, it would be unsafe to * proceed with directory entry fix, so bail out in that @@ -412,10 +413,16 @@ checksize(struct fat_descriptor *fat, u_char *p, struct dosDirEntry *dir) if (ret == FSERROR) { return (FSERROR); } - physicalSize *= boot->ClusterSize; + /* + * The maximum file size on FAT32 is 4GiB - 1, which + * will occupy a cluster chain of exactly 4GiB in + * size. On 32-bit platforms, since size_t is 32-bit, + * it would wrap back to 0. + */ + physicalSize = (u_int64_t)chainsize * boot->ClusterSize; } if (physicalSize < dir->size) { - pwarn("size of %s is %u, should at most be %zu\n", + pwarn("size of %s is %u, should at most be %" PRIu64 "\n", fullpath(dir), dir->size, physicalSize); if (ask(1, "Truncate")) { dir->size = physicalSize; |