[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/13] vvfat: limit number of entries in root dir
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v2 11/13] vvfat: limit number of entries in root directory in FAT12/FAT16 |
Date: |
Mon, 22 May 2017 23:12:03 +0200 |
FAT12/FAT16 root directory is two sectors in size, which allows only 512
directory entries.
Prevent QEMU startup if too much files exist, instead of overflowing root
directory.
Also introduce variable root_entries, which will be required for FAT32.
Fixes: https://bugs.launchpad.net/qemu/+bug/1599539/comments/4
Signed-off-by: Hervé Poussineau <address@hidden>
---
block/vvfat.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/block/vvfat.c b/block/vvfat.c
index 414bca6dee..5376659010 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -338,8 +338,9 @@ typedef struct BDRVVVFATState {
unsigned int cluster_size;
unsigned int sectors_per_cluster;
unsigned int sectors_per_fat;
- unsigned int sectors_of_root_directory;
uint32_t last_cluster_of_root_directory;
+ /* how many entries are available in root directory (0 for FAT32) */
+ uint16_t root_entries;
uint32_t sector_count; /* total number of sectors of the partition */
uint32_t cluster_count; /* total number of clusters of this partition */
uint32_t max_fat_value;
@@ -786,6 +787,12 @@ static int read_directory(BDRVVVFATState* s, int
mapping_index)
int is_dot=!strcmp(entry->d_name,".");
int is_dotdot=!strcmp(entry->d_name,"..");
+ if (first_cluster == 0 && s->directory.next >= s->root_entries - 1) {
+ fprintf(stderr, "Too many entries in root directory\n");
+ closedir(dir);
+ return -2;
+ }
+
if(first_cluster == 0 && (is_dotdot || is_dot))
continue;
@@ -859,15 +866,15 @@ static int read_directory(BDRVVVFATState* s, int
mapping_index)
memset(direntry,0,sizeof(direntry_t));
}
-/* TODO: if there are more entries, bootsector has to be adjusted! */
-#define ROOT_ENTRIES (0x02 * 0x10 * s->sectors_per_cluster)
- if (mapping_index == 0 && s->directory.next < ROOT_ENTRIES) {
+ if (s->fat_type != 32 &&
+ mapping_index == 0 &&
+ s->directory.next < s->root_entries) {
/* root directory */
int cur = s->directory.next;
- array_ensure_allocated(&(s->directory), ROOT_ENTRIES - 1);
- s->directory.next = ROOT_ENTRIES;
+ array_ensure_allocated(&(s->directory), s->root_entries - 1);
+ s->directory.next = s->root_entries;
memset(array_get(&(s->directory), cur), 0,
- (ROOT_ENTRIES - cur) * sizeof(direntry_t));
+ (s->root_entries - cur) * sizeof(direntry_t));
}
/* re-get the mapping, since s->mapping was possibly realloc()ed */
@@ -932,6 +939,8 @@ static int init_directories(BDRVVVFATState* s,
/* Now build FAT, and write back information into directory */
init_fat(s);
+ /* TODO: if there are more entries, bootsector has to be adjusted! */
+ s->root_entries = 0x02 * 0x10 * s->sectors_per_cluster;
s->cluster_count=sector2cluster(s, s->sector_count);
mapping = array_get_next(&(s->mapping));
@@ -1000,7 +1009,6 @@ static int init_directories(BDRVVVFATState* s,
}
mapping = array_get(&(s->mapping), 0);
- s->sectors_of_root_directory = mapping->end * s->sectors_per_cluster;
s->last_cluster_of_root_directory = mapping->end;
/* the FAT signature */
@@ -1019,7 +1027,7 @@ static int init_directories(BDRVVVFATState* s,
bootsector->sectors_per_cluster=s->sectors_per_cluster;
bootsector->reserved_sectors=cpu_to_le16(1);
bootsector->number_of_fats=0x2; /* number of FATs */
- bootsector->root_entries=cpu_to_le16(s->sectors_of_root_directory*0x10);
+ bootsector->root_entries = cpu_to_le16(s->root_entries);
bootsector->total_sectors16=s->sector_count>0xffff?0:cpu_to_le16(s->sector_count);
/* media descriptor: hard disk=0xf8, floppy=0xf0 */
bootsector->media_type = (s->offset_to_bootsector > 0 ? 0xf8 : 0xf0);
--
2.11.0
- Re: [Qemu-devel] [PATCH v2 13/13] vvfat: change OEM name to 'MSWIN4.1', (continued)
- [Qemu-devel] [PATCH v2 06/13] vvfat: fix field names in FAT12/FAT16 and FAT32 boot sectors, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 08/13] vvfat: correctly create long names for non-ASCII filenames, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 12/13] vvfat: handle KANJI lead byte 0xe5, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 07/13] vvfat: always create . and .. entries at first and in that order, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 10/13] vvfat: correctly generate numeric-tail of short file names, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 09/13] vvfat: correctly create base short names for non-ASCII filenames, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 11/13] vvfat: limit number of entries in root directory in FAT12/FAT16,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v2 05/13] vvfat: introduce offset_to_bootsector, offset_to_fat and offset_to_root_dir, Hervé Poussineau, 2017/05/22
- [Qemu-devel] [PATCH v2 02/13] vvfat: replace tabs by 8 spaces, Hervé Poussineau, 2017/05/22
- Re: [Qemu-devel] [PATCH v2 00/13] vvfat: misc fixes for read-only mode, no-reply, 2017/05/22