[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 03/04: memorypool: added more asserts
From: |
gnunet |
Subject: |
[libmicrohttpd] 03/04: memorypool: added more asserts |
Date: |
Wed, 05 Apr 2023 18:46:38 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 95ad2a9a480435e86dfa1bbd7a6798150320d3bd
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Wed Apr 5 14:14:20 2023 +0300
memorypool: added more asserts
---
configure.ac | 4 ++++
src/microhttpd/memorypool.c | 11 +++++++++++
2 files changed, 15 insertions(+)
diff --git a/configure.ac b/configure.ac
index 700c46a4..c31bb2a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4303,6 +4303,10 @@ AS_VAR_IF([enable_sanitizers], ["no"], [:],
AC_CHECK_HEADERS([sanitizer/asan_interface.h], [], [],
[AC_INCLUDES_DEFAULT])
AS_VAR_IF([ac_cv_header_sanitizer_asan_interface_h],["yes"],
[
+ CFLAGS="${CFLAGS_ac} ${san_CFLAGS} ${san_FLAGS}
${errattr_CFLAGS} ${user_CFLAGS}"
+ MHD_CHECK_FUNC([__asan_region_is_poisoned],[[#include
<sanitizer/asan_interface.h>]],
+ [[int a_var=1; i][f(((void*) 0) !=
__asan_region_is_poisoned((void*) &a_var, sizeof(a_var))) return 3;]]
+ )
AC_CACHE_CHECK([whether special function attribute is
needed for user-poison], [mhd_cv_func_u_p_attribute_needed],
[
ASAN_OPTIONS="exitcode=88:detect_invalid_pointer_pairs=3:halt_on_error=1"
diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c
index cd358f95..e0511830 100644
--- a/src/microhttpd/memorypool.c
+++ b/src/microhttpd/memorypool.c
@@ -345,6 +345,7 @@ MHD_pool_destroy (struct MemoryPool *pool)
mhd_assert (pool->end >= pool->pos);
mhd_assert (pool->size >= pool->end - pool->pos);
+ mhd_assert (pool->pos == ROUND_TO_ALIGN (pool->pos));
_MHD_UNPOISON_MEMORY (pool->memory, pool->size);
if (! pool->is_mmap)
free (pool->memory);
@@ -374,6 +375,7 @@ MHD_pool_get_free (struct MemoryPool *pool)
{
mhd_assert (pool->end >= pool->pos);
mhd_assert (pool->size >= pool->end - pool->pos);
+ mhd_assert (pool->pos == ROUND_TO_ALIGN (pool->pos));
#ifdef MHD_ASAN_POISON_ACTIVE
if ((pool->end - pool->pos) <= _MHD_RED_ZONE_SIZE)
return 0;
@@ -403,6 +405,7 @@ MHD_pool_allocate (struct MemoryPool *pool,
mhd_assert (pool->end >= pool->pos);
mhd_assert (pool->size >= pool->end - pool->pos);
+ mhd_assert (pool->pos == ROUND_TO_ALIGN (pool->pos));
asize = ROUND_TO_ALIGN_PLUS_RED_ZONE (size);
if ( (0 == asize) && (0 != size) )
return NULL; /* size too close to SIZE_MAX */
@@ -452,6 +455,7 @@ MHD_pool_try_alloc (struct MemoryPool *pool,
mhd_assert (pool->end >= pool->pos);
mhd_assert (pool->size >= pool->end - pool->pos);
+ mhd_assert (pool->pos == ROUND_TO_ALIGN (pool->pos));
asize = ROUND_TO_ALIGN_PLUS_RED_ZONE (size);
if ( (0 == asize) && (0 != size) )
{ /* size is too close to SIZE_MAX, very unlikely */
@@ -505,6 +509,10 @@ MHD_pool_reallocate (struct MemoryPool *pool,
mhd_assert (pool->size >= pool->end - pool->pos);
mhd_assert (old != NULL || old_size == 0);
mhd_assert (pool->size >= old_size);
+ mhd_assert (pool->pos == ROUND_TO_ALIGN (pool->pos));
+#if defined(MHD_ASAN_POISON_ACTIVE) && defined(HAVE___ASAN_REGION_IS_POISONED)
+ mhd_assert (NULL == __asan_region_is_poisoned (old, old_size));
+#endif /* MHD_ASAN_POISON_ACTIVE && HAVE___ASAN_REGION_IS_POISONED */
if (NULL != old)
{ /* Have previously allocated data */
@@ -596,6 +604,9 @@ MHD_pool_reset (struct MemoryPool *pool,
/* (keep == NULL || pool->memory + pool->size >= (uint8_t*) keep +
copy_bytes) */
mhd_assert ((keep == NULL) || \
(pool->size >= mp_ptr_diff_ (keep, pool->memory) + copy_bytes));
+#if defined(MHD_ASAN_POISON_ACTIVE) && defined(HAVE___ASAN_REGION_IS_POISONED)
+ mhd_assert (NULL == __asan_region_is_poisoned (keep, copy_bytes));
+#endif /* MHD_ASAN_POISON_ACTIVE && HAVE___ASAN_REGION_IS_POISONED */
_MHD_UNPOISON_MEMORY (pool->memory, new_size);
if ( (NULL != keep) &&
(keep != pool->memory) )
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.