mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-21 01:21:00 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: tools: add a secure implementation of memset

Browse Source 
This guarantees that the compiler will not optimize away the memset()
call if it detects a dead store.

Use this to clear SSL passphrases.

No backport needed.
This commit is contained in:
Maxime Henrion 2025-12-19 10:40:38 -05:00 committed by William Lallemand
parent bd92f34f02
commit c8750e4e9d
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/tools.h
View File

@ -1490,4 +1490,6 @@ int path_base(const char *path, const char *base, char *dst, char **err);
void ha_freearray(char ***array); void ha_freearray(char ***array);
void ha_memset_s(void *s, int c, size_t n);
#endif /* _HAPROXY_TOOLS_H */ #endif /* _HAPROXY_TOOLS_H */

2
src/ssl_sock.c
View File

@ -3756,7 +3756,7 @@ static int ssl_sock_clear_passphrase_cache(void)
/* Erase stored passphrases just in case some memory /* Erase stored passphrases just in case some memory
* ends up leaking */ * ends up leaking */
memset(passphrase_cache[idx].ptr, 0, passphrase_cache[idx].len); ha_memset_s(passphrase_cache[idx].ptr, 0, passphrase_cache[idx].len);
istfree(&passphrase_cache[idx]); istfree(&passphrase_cache[idx]);
} }
ha_free(&passphrase_cache); ha_free(&passphrase_cache);

9
src/tools.c
View File

@ -7438,6 +7438,15 @@ void ha_freearray(char ***array)
*array = NULL; *array = NULL;
} }
/*
* Secure implementation of memset that cannot be optimized away.
*/
void ha_memset_s(void *s, int c, size_t n)
{
memset(s, c, n);
__asm__ __volatile__("" : : "r"(s) : "memory");
}
/* /*
* Local variables: * Local variables:
* c-indent-level: 8 * c-indent-level: 8