kamkow1/Limine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs/iso9660: Require sector-aligned directory sizes

Browse Source
This commit is contained in:
Mintsuki
2026-04-18 22:29:36 +02:00
parent 89ce18ca5c
commit 94912265ec
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/fs/iso9660.s2.c
View File

@@ -143,8 +143,10 @@ static void iso9660_cache_root(struct volume *vol,
*root_size = pv.root.extent_size.little; *root_size = pv.root.extent_size.little;
// Validate root directory size to prevent memory exhaustion // Validate root directory size to prevent memory exhaustion, and require
if (*root_size == 0 || *root_size > ISO9660_MAX_DIR_SIZE) { // sector alignment so directory-traversal sector-skip arithmetic is sound.
if (*root_size == 0 || *root_size > ISO9660_MAX_DIR_SIZE
|| *root_size % ISO9660_SECTOR_SIZE != 0) {
panic(false, "ISO9660: Invalid root directory size"); panic(false, "ISO9660: Invalid root directory size");
} }
@@ -490,8 +492,11 @@ struct file_handle *iso9660_open(struct volume *vol, const char *path) {
pmm_free(current, current_size); pmm_free(current, current_size);
} }
// Validate directory size to prevent memory exhaustion // Validate directory size to prevent memory exhaustion, and require
if (next_size == 0 || next_size > ISO9660_MAX_DIR_SIZE) { // sector alignment so directory-traversal sector-skip arithmetic is
// sound.
if (next_size == 0 || next_size > ISO9660_MAX_DIR_SIZE
|| next_size % ISO9660_SECTOR_SIZE != 0) {
pmm_free(ret, sizeof(struct iso9660_file_handle)); pmm_free(ret, sizeof(struct iso9660_file_handle));
return NULL; return NULL;
} }