Changeset 0dbd4a9 in mainline for uspace/srv/bd/hr/metadata/foreign/geom/hr_g_stripe.c

Timestamp:

2025-06-28T22:52:18Z (9 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

9c9955ab

Parents:

2192a01

Message:

hr: metadata: validate magic early in decode

File:

• uspace/srv/bd/hr/metadata/foreign/geom/hr_g_stripe.c (modified) (5 diffs)

uspace/srv/bd/hr/metadata/foreign/geom/hr_g_stripe.c

@@ -60 +60 @@
 static errno_t meta_gstripe_get_block(service_id_t, void **);
 /* static errno_t meta_gstripe_write_block(service_id_t, const void *); */
-static bool meta_gstripe_has_valid_magic(const void *);
 
 static errno_t meta_gstripe_probe(service_id_t, void **);
@@ -116 +115 @@
                 goto error;
 
-        if (!meta_gstripe_has_valid_magic(metadata_struct)) {
-                rc = ENOFS;
-                goto error;
-        }
-
         *rmd = metadata_struct;
         return EOK;
@@ -126 +120 @@
 error:
         free(metadata_struct);
-        return ENOFS;
+        return rc;
 }
 
@@ -318 +312 @@
         HR_DEBUG("%s()", __func__);
 
-        stripe_metadata_decode(block, md_v);
+        struct g_stripe_metadata *md = md_v;
+
+        stripe_metadata_decode(block, md);
+
+        if (str_lcmp(md->md_magic, G_STRIPE_MAGIC, 16) != 0)
+                return EINVAL;
 
         return EOK;
@@ -397 +396 @@
 #endif
 
-static bool meta_gstripe_has_valid_magic(const void *md_v)
-{
-        HR_DEBUG("%s()", __func__);
-
-        const struct g_stripe_metadata *md = md_v;
-
-        if (str_lcmp(md->md_magic, G_STRIPE_MAGIC, 16) != 0)
-                return false;
-
-        return true;
-}
-
 /** @}
  */