malloc_usable_size: clean abort on invalid region

It's the region pointer that can be NULL here, and p was checked at the beginning of the function. Also fix the test accordingly.
GrapheneOS · Feb 10, 2021 · 76860c7 · 76860c7
1 parent 5c8b686
commit 76860c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/h_malloc.c b/h_malloc.c
@@ -1630,7 +1630,7 @@ EXPORT size_t h_malloc_usable_size(H_MALLOC_USABLE_SIZE_CONST void *p) {
     struct region_allocator *ra = ro.region_allocator;
     mutex_lock(&ra->lock);
     struct region_metadata *region = regions_find(p);
-    if (p == NULL) {
+    if (region == NULL) {
         fatal_error("invalid malloc_usable_size");
     }
     size_t size = region->size;

diff --git a/test/simple-memory-corruption/test_smc.py b/test/simple-memory-corruption/test_smc.py
@@ -145,9 +145,11 @@ def test_uninitialized_free(self):
                          "fatal allocator error: invalid free\n")
 
     def test_uninitialized_malloc_usable_size(self):
-        _stdout, _stderr, returncode = self.run_test(
+        _stdout, stderr, returncode = self.run_test(
             "uninitialized_malloc_usable_size")
-        self.assertEqual(returncode, -11)
+        self.assertEqual(returncode, -6)
+        self.assertEqual(stderr.decode("utf-8"),
+                         "fatal allocator error: invalid malloc_usable_size\n")
 
     def test_uninitialized_realloc(self):
         _stdout, stderr, returncode = self.run_test("uninitialized_realloc")