mirror of
https://github.com/systemd/systemd.git
synced 2026-11-06 21:36:59 +00:00
Turns out that clang's interprocedural analysis is quite smart and can
look through our expand_to_usable() trick, which then causes crashes
with _FORTIFY_SOURCE=3.
clang's interprocedural analysis can see that expand_to_usable() simply
returns its first argument, so it replaces all uses of the return value
with that argument (the original realloc() result). This effectively
bypasses expand_to_usable()'s alloc_size attribute, causing the fortify
check to use the (smaller) size from realloc() instead, which eventually
leads to a false-positive buffer overflow:
$ build/test-varlink-idl
/* test_parse_format */
...
*** buffer overflow detected ***: terminated
Aborted (core dumped) build/test-varlink-idl
This is not an issue with gcc (at least not yet), since gcc sees
expand_to_usable() as an opaque user-defined allocation-like function
and simply trusts the alloc_size attribute that comes with it.
To fix this, let's add a simple no-op barrier to malloc_sizeof_safe()
that clobbers the input pointer, which causes
__builtin_dynamic_object_size() to return (size_t)-1 - this is
interpreted as an "unknown" size by the following fortify check which is
then skipped instead of triggering the assertion.
Similarly, test-alloc-util now doesn't call malloc_usable_size()
directly but instead goes through malloc_sizeof_safe(), so it's also
guarded by the barrier.
This follows the already established pile of similar workaround for the
same class of issues we encountered with gcc, namely [0], which prompted
[1], that was later reverted in [2], and then followed by another couple
of fixes in [3] and [4].
Resolves: #43178
[0] https://github.com/systemd/systemd/issues/22801
[1] https://github.com/systemd/systemd/commit/0bd292567a543d124cd303f7dd61169a209cae64
[2] https://github.com/systemd/systemd/commit/2cfb790391958ada34284290af1f9ab863a515c7
[3] https://github.com/systemd/systemd/commit/7929e180aa47a2692ad4f053afac2857d7198758
[4] https://github.com/systemd/systemd/commit/4f79f545b3c46c358666c9f5f2b384fe50aac4b4
(cherry picked from commit a56d7db48f)
182 lines
4.8 KiB
C
182 lines
4.8 KiB
C
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
|
|
#include <malloc.h>
|
|
|
|
#include "alloc-util.h"
|
|
|
|
void* memdup(const void *p, size_t l) {
|
|
void *ret;
|
|
|
|
assert(l == 0 || p);
|
|
|
|
ret = malloc(l ?: 1);
|
|
if (!ret)
|
|
return NULL;
|
|
|
|
return memcpy_safe(ret, p, l);
|
|
}
|
|
|
|
void* memdup_suffix0(const void *p, size_t l) {
|
|
void *ret;
|
|
|
|
assert(l == 0 || p);
|
|
|
|
/* The same as memdup() but place a safety NUL byte after the allocated memory */
|
|
|
|
if (_unlikely_(l == SIZE_MAX)) /* prevent overflow */
|
|
return NULL;
|
|
|
|
ret = malloc(l + 1);
|
|
if (!ret)
|
|
return NULL;
|
|
|
|
((uint8_t*) ret)[l] = 0;
|
|
return memcpy_safe(ret, p, l);
|
|
}
|
|
|
|
size_t malloc_sizeof_safe(void **xp) {
|
|
POINTER_MAY_BE_NULL(xp);
|
|
|
|
if (_unlikely_(!xp || !*xp))
|
|
return 0;
|
|
|
|
/* Prevent the compiler from retaining a tighter object-size bound on *xp from a prior allocator call
|
|
* (e.g. realloc()). This adds a simple no-op barrier after which the *xp pointer becomes clobbered,
|
|
* which forces clang to skip fortify checks. Without this, clang's __builtin_dynamic_object_size()
|
|
* (used with _FORTIFY_SOURCE=3) keeps the requested-size bound from realloc() and ignores
|
|
* expand_to_usable()'s __alloc_size__, causing false-positive fortify failures when we zero the
|
|
* malloc_usable_size() region in realloc0()/greedy_realloc0(). */
|
|
asm volatile("" : "+r"(*xp));
|
|
|
|
size_t sz = malloc_usable_size(*xp);
|
|
*xp = expand_to_usable(*xp, sz);
|
|
/* GCC doesn't see the _returns_nonnull_ when built with ubsan, so yet another hint to make it doubly
|
|
* clear that expand_to_usable won't return NULL.
|
|
* See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79265 */
|
|
if (!*xp)
|
|
assert_not_reached();
|
|
return sz;
|
|
}
|
|
|
|
void* expand_to_usable(void *ptr, size_t newsize _unused_) {
|
|
return ptr;
|
|
}
|
|
|
|
void* realloc0(void *p, size_t new_size) {
|
|
size_t old_size;
|
|
void *q;
|
|
|
|
/* Like realloc(), but initializes anything appended to zero */
|
|
|
|
old_size = MALLOC_SIZEOF_SAFE(p);
|
|
|
|
q = realloc(p, new_size);
|
|
if (!q)
|
|
return NULL;
|
|
|
|
new_size = MALLOC_SIZEOF_SAFE(q); /* Update with actually allocated space */
|
|
|
|
if (new_size > old_size)
|
|
memset((uint8_t*) q + old_size, 0, new_size - old_size);
|
|
|
|
return q;
|
|
}
|
|
|
|
void* greedy_realloc(
|
|
void **p,
|
|
size_t need,
|
|
size_t size) {
|
|
|
|
size_t newalloc;
|
|
void *q;
|
|
|
|
assert(p);
|
|
|
|
/* We use malloc_usable_size() for determining the current allocated size. On all systems we care
|
|
* about this should be safe to rely on. Should there ever arise the need to avoid relying on this we
|
|
* can instead locally fall back to realloc() on every call, rounded up to the next exponent of 2 or
|
|
* so. */
|
|
|
|
if (*p && (size == 0 || (MALLOC_SIZEOF_SAFE(*p) / size >= need)))
|
|
return *p;
|
|
|
|
if (_unlikely_(need > SIZE_MAX/2)) /* Overflow check */
|
|
return NULL;
|
|
newalloc = need * 2;
|
|
|
|
if (!MUL_ASSIGN_SAFE(&newalloc, size))
|
|
return NULL;
|
|
|
|
if (newalloc < 64) /* Allocate at least 64 bytes */
|
|
newalloc = 64;
|
|
|
|
q = realloc(*p, newalloc);
|
|
if (!q)
|
|
return NULL;
|
|
|
|
return *p = q;
|
|
}
|
|
|
|
void* greedy_realloc0(
|
|
void **p,
|
|
size_t need,
|
|
size_t size) {
|
|
|
|
size_t before, after;
|
|
uint8_t *q;
|
|
|
|
assert(p);
|
|
|
|
before = MALLOC_SIZEOF_SAFE(*p); /* malloc_usable_size() will return 0 on NULL input, as per docs */
|
|
|
|
q = greedy_realloc(p, need, size);
|
|
if (!q)
|
|
return NULL;
|
|
|
|
after = MALLOC_SIZEOF_SAFE(q);
|
|
|
|
if (size == 0) /* avoid division by zero */
|
|
before = 0;
|
|
else
|
|
before = (before / size) * size; /* Round down */
|
|
|
|
if (after > before)
|
|
memzero(q + before, after - before);
|
|
|
|
return q;
|
|
}
|
|
|
|
void* greedy_realloc_append(
|
|
void **p,
|
|
size_t *n_p,
|
|
const void *from,
|
|
size_t n_from,
|
|
size_t size) {
|
|
|
|
uint8_t *q;
|
|
|
|
assert(p);
|
|
assert(n_p);
|
|
assert(from || n_from == 0);
|
|
|
|
if (n_from > SIZE_MAX - *n_p)
|
|
return NULL;
|
|
|
|
q = greedy_realloc(p, *n_p + n_from, size);
|
|
if (!q)
|
|
return NULL;
|
|
|
|
memcpy_safe(q + *n_p * size, from, n_from * size);
|
|
|
|
*n_p += n_from;
|
|
|
|
return q;
|
|
}
|
|
|
|
void free_many(void **p, size_t n) {
|
|
assert(p || n == 0);
|
|
|
|
FOREACH_ARRAY(i, p, n)
|
|
*i = mfree(*i);
|
|
}
|