Changeset aca1777 in mainline for kernel/generic/src/mm/malloc.c

Timestamp:

2025-05-08T17:12:05Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

2f21cd4

Parents:

1cfce3f (diff), 61f28c4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge upstream into helenraid

File:

• kernel/generic/src/mm/malloc.c (modified) (2 diffs)

kernel/generic/src/mm/malloc.c

@@ -190 +190 @@
                 return NULL;
 
-        void *obj = mem_alloc(alignof(max_align_t), size + _offset) + _offset;
+        void *obj = mem_alloc(alignof(max_align_t), size + _offset);
+        if (!obj)
+                return NULL;
+
+        obj += _offset;
 
         /* Remember the allocation size just before the object. */
@@ -205 +209 @@
          * slab_free() will detect it and panic.
          */
-        size_t size = ((size_t *) obj)[-1];
-        mem_free(obj - _offset, alignof(max_align_t), size + _offset);
+        if (obj) {
+                size_t size = ((size_t *) obj)[-1];
+                mem_free(obj - _offset, alignof(max_align_t), size + _offset);
+        }
 }