:: commit c440830a6e994f5c290074efc730e8cfde5aa35e

diff --git a/common/fs/fat32.s2.c b/common/fs/fat32.s2.c
index 626bb7e6..b0a9eb4f 100644
--- a/common/fs/fat32.s2.c
+++ b/common/fs/fat32.s2.c
@@ -220,11 +220,7 @@ bytes_per_sector_valid:;
         return 1;  // Overflow in root_start calculation
     }
     context->root_start = (uint32_t)root_start_64;
-    uint64_t root_dir_bytes_temp;
-    if (__builtin_mul_overflow((uint64_t)context->root_entries, (uint64_t)sizeof(struct fat32_directory_entry), &root_dir_bytes_temp)) {
-        return 1;
-    }
-    context->root_size = DIV_ROUNDUP(root_dir_bytes_temp, context->bytes_per_sector);
+    context->root_size = DIV_ROUNDUP(context->root_entries * sizeof(struct fat32_directory_entry), context->bytes_per_sector);
     switch (context->type) {
         case 12:
         case 16:
@@ -506,11 +502,7 @@ static int fat32_open_in(struct fat32_context* context, struct fat32_directory_e
 
         pmm_free(directory_cluster_chain, dir_chain_len * sizeof(uint32_t));
     } else {
-        uint64_t root_dir_bytes_temp;
-        if (__builtin_mul_overflow((uint64_t)context->root_entries, (uint64_t)sizeof(struct fat32_directory_entry), &root_dir_bytes_temp)) {
-            return -1;
-        }
-        dir_chain_len = DIV_ROUNDUP(root_dir_bytes_temp, block_size);
+        dir_chain_len = DIV_ROUNDUP(context->root_entries * sizeof(struct fat32_directory_entry), block_size);
 
         // Check for overflow
         size_t alloc_size;