summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-18 09:17:09 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-20 08:15:24 +0200
commit6adad1e70ad24f1c59b06ed91c8c609b26d946d5 (patch)
tree5614035c700ed3224d56563ba294a4e1d2c623f3
parentposix: Fix return states of pthread_kill() (diff)
downloadrtems-6adad1e70ad24f1c59b06ed91c8c609b26d946d5.tar.bz2
fat: Fix for invalid cluster sizes
A cluster size > 32KiB resulted in an infinite loop in fat_init_volume_info() due to an integer overflow. Update #2717.
-rw-r--r--cpukit/libfs/src/dosfs/fat.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpukit/libfs/src/dosfs/fat.c b/cpukit/libfs/src/dosfs/fat.c
index ad1dd2afe0..01faf651bc 100644
--- a/cpukit/libfs/src/dosfs/fat.c
+++ b/cpukit/libfs/src/dosfs/fat.c
@@ -430,12 +430,14 @@ fat_init_volume_info(rtems_filesystem_mount_table_entry_t *mt_entry)
/*
* "bytes per cluster" value greater than 32K is invalid
*/
- if ((vol->bpc = vol->bps << vol->spc_log2) > MS_BYTES_PER_CLUSTER_LIMIT)
+ if (vol->bps > (MS_BYTES_PER_CLUSTER_LIMIT >> vol->spc_log2))
{
rtems_disk_release(vol->dd);
rtems_set_errno_and_return_minus_one(EINVAL);
}
+ vol->bpc = vol->bps << vol->spc_log2;
+
for (vol->bpc_log2 = 0, i = vol->bpc; (i & 1) == 0;
i >>= 1, vol->bpc_log2++);