RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-15 18:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: pools: silence build warnings with DEBUG_MEMORY_POOLS and DEBUG_UAF

Browse Source 
With these debug options we still get these warnings:

include/common/memory.h:501:23: warning: null pointer dereference [-Wnull-dereference]
    *(volatile int *)0 = 0;
    ~~~~~~~~~~~~~~~~~~~^~~
include/common/memory.h:460:22: warning: null pointer dereference [-Wnull-dereference]
   *(volatile int *)0 = 0;
   ~~~~~~~~~~~~~~~~~~~^~~

These are purposely there to crash the process at specific locations.
But the annoying warnings do not help with debugging and they are not
even reliable as the compiler may decide to optimize them away. Let's
pass the pointer through DISGUISE() to avoid this.
This commit is contained in:
Willy Tarreau 2020-03-14 11:08:16 +01:00
parent 2e8ab6b560
commit e4d42551bd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common/memory.h
View File

@ -335,7 +335,7 @@ static inline void pool_free(struct pool_head *pool, void *ptr)
#ifdef DEBUG_MEMORY_POOLS
/* we'll get late corruption if we refill to the wrong pool or double-free */
if (*POOL_LINK(pool, ptr) != (void *)pool)
*(volatile int *)0 = 0;
*DISGUISE((volatile int *)0) = 0;
#endif
if (mem_poison_byte >= 0)
memset(ptr, mem_poison_byte, pool->size);
@ -457,7 +457,7 @@ static inline void pool_free_area(void *area, size_t size)
size_t pad = (4096 - size) & 0xFF0;
if (pad >= sizeof(void *) && *(void **)(area - sizeof(void *)) != area)
*(volatile int *)0 = 0;
*DISGUISE((volatile int *)0) = 0;
thread_harmless_now();
munmap(area - pad, (size + 4095) & -4096);
@ -498,7 +498,7 @@ static inline void pool_free(struct pool_head *pool, void *ptr)
#ifdef DEBUG_MEMORY_POOLS
/* we'll get late corruption if we refill to the wrong pool or double-free */
if (*POOL_LINK(pool, ptr) != (void *)pool)
*(volatile int *)0 = 0;
*DISGUISE((volatile int *)0) = 0;
#endif
#ifndef DEBUG_UAF /* normal pool behaviour */