Changeset 2b55edb in mainline

Timestamp:

2013-07-30T08:00:44Z (11 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

493b881

Parents:

e3bc355

Message:

libgpt checks boundaries

Location:

uspace

Files:

• app/hdisk/func_gpt.c (modified) (1 diff)
• lib/gpt/libgpt.c (modified) (6 diffs)

uspace/app/hdisk/func_gpt.c

@@ -184 +184 @@
                 sa = gpt_get_next_aligned(sa, alignment);
         
-        printf("Set end addres (number): ");
+        printf("Set end address (number): ");
         ea = get_input_uint64(in);
         

uspace/lib/gpt/libgpt.c

@@ -58 +58 @@
 static uint8_t get_byte(const char *);
 static bool check_overlap(gpt_part_t *, gpt_part_t *);
+static bool check_encaps(gpt_part_t *, uint64_t, uint64_t);
 
 /** Allocate memory for gpt label */
@@ -308 +309 @@
                         goto fini_fail;
         }
-
-        /*
-         * FIXME: so far my boasting about variable partition entry size
-         * will not work. The CRC32 checksums will be different.
-         * This can't be fixed easily - we'd have to run the checksum
-         * on all of the partition entry array.
-         */
+        
         uint32_t crc = compute_crc32((uint8_t *) label->parts->part_array, 
-                           fillries * sizeof(gpt_entry_t));
+                           fillries * ent_size);
 
         if(uint32_t_le2host(label->gpt->header->pe_array_crc32) != crc)
@@ -350 +345 @@
         size_t fillries = label->parts->fill > GPT_MIN_PART_NUM ? label->parts->fill : GPT_MIN_PART_NUM;
         
-        label->gpt->header->fillries = host2uint32_t_le(fillries);
-        label->gpt->header->pe_array_crc32 = host2uint32_t_le(compute_crc32(
-                                       (uint8_t *) label->parts->part_array,
-                                       fillries * e_size));
+        if (e_size != sizeof(gpt_entry_t))
+                return ENOTSUP;
         
         /* comm_size of 4096 is ignored */
@@ -369 +362 @@
                 goto fail;
         
+        label->gpt->header->fillries = host2uint32_t_le(fillries);
         uint64_t arr_blocks = (fillries * sizeof(gpt_entry_t)) / b_size;
         label->gpt->header->first_usable_lba = host2uint64_t_le(arr_blocks + 1);
-        label->gpt->header->last_usable_lba = host2uint64_t_le(n_blocks - arr_blocks - 2);
+        uint64_t first_lba = n_blocks - arr_blocks - 2;
+        label->gpt->header->last_usable_lba = host2uint64_t_le(first_lba);
+        
+        /* Perform checks */
+        gpt_part_foreach(label, p) {
+                if (gpt_get_part_type(p) == GPT_PTE_UNUSED)
+                        continue;
+                
+                if (!check_encaps(p, n_blocks, first_lba)) {
+                        rc = ERANGE;
+                        goto fail;
+                }
+                
+                gpt_part_foreach(label, q) {
+                        if (p == q)
+                                continue;
+                        
+                        if (gpt_get_part_type(p) != GPT_PTE_UNUSED) {
+                                if (check_overlap(p, q)) {
+                                        rc = ERANGE;
+                                        goto fail;
+                                }
+                        }
+                }
+        }
+        
+        label->gpt->header->pe_array_crc32 = host2uint32_t_le(compute_crc32(
+                                       (uint8_t *) label->parts->part_array,
+                                       fillries * e_size));
         
         
@@ -483 +505 @@
 int gpt_add_partition(gpt_label_t *label, gpt_part_t *partition)
 {
-        /* FIXME: Check dimensions! */
-        gpt_part_foreach(label, p) {
-                if (gpt_get_part_type(p) != GPT_PTE_UNUSED) {
-                        if (check_overlap(partition, p))
-                                return EINVAL;
-                }
-        }
-        
         gpt_part_t *p;
         /* Find the first empty entry */
@@ -833 +847 @@
 }
 
-
+static bool check_encaps(gpt_part_t *p, uint64_t n_blocks, uint64_t first_lba)
+{
+        uint64_t start = uint64_t_le2host(p->start_lba);
+        uint64_t end = uint64_t_le2host(p->end_lba);
+        
+        if (start >= first_lba && end < n_blocks - first_lba)
+                return true;
+        
+        return false;
+}