Changeset b33d140 in mainline for uspace/lib/label/src/gpt.c

Timestamp:

2017-08-26T21:59:30Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8ebc5b8a

Parents:

ac415d50

Message:

GPT should check alt. header block address for sanity before trying to read it.

File:

• uspace/lib/label/src/gpt.c (modified) (3 diffs)

uspace/lib/label/src/gpt.c

@@ -99 +99 @@
         uint8_t *etable[2];
         size_t bsize;
+        aoff64_t nblocks;
         uint32_t num_entries;
         uint32_t esize;
@@ -123 +124 @@
         }
 
+        rc = bd->ops->get_nblocks(bd->arg, &nblocks);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
+
         if (bsize < 512 || (bsize % 512) != 0) {
                 rc = EINVAL;
@@ -147 +154 @@
 
         h1ba = uint64_t_le2host(gpt_hdr[0]->alternate_lba);
+
+        if (h1ba >= nblocks) {
+                rc = EINVAL;
+                goto error;
+        }
 
         rc = bd->ops->read(bd->arg, h1ba, 1, gpt_hdr[1]);