zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use static array (length 256) for copy of OPENSSL_MALLOC_FAILURES

Browse Source 
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26039)
This commit is contained in:
sftcd 2024-11-25 16:01:39 +00:00 committed by Tomas Mraz
parent 0bba821881
commit 740668f0b5
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crypto/mem.c
View File

@ -38,7 +38,8 @@ static TSAN_QUALIFIER int free_count;
# define LOAD(x) tsan_load(&x) # define LOAD(x) tsan_load(&x)
# endif /* TSAN_REQUIRES_LOCKING */ # endif /* TSAN_REQUIRES_LOCKING */
static char *md_failstring; static char md_failbuf[CRYPTO_MEM_CHECK_MAX_FS + 1];
static char *md_failstring = NULL;
static long md_count; static long md_count;
static int md_fail_percent = 0; static int md_fail_percent = 0;
static int md_tracefd = -1; static int md_tracefd = -1;
@ -164,9 +165,17 @@ static int shouldfail(void)
void ossl_malloc_setup_failures(void) void ossl_malloc_setup_failures(void)
{ {
const char *cp = getenv("OPENSSL_MALLOC_FAILURES"); const char *cp = getenv("OPENSSL_MALLOC_FAILURES");
size_t cplen = 0;
if (cp != NULL && (md_failstring = strdup(cp)) != NULL) if (cp != NULL) {
parseit(); /* if the value is too long we'll just ignore it */
cplen = strlen(cp);
if (cplen <= CRYPTO_MEM_CHECK_MAX_FS) {
strncpy(md_failbuf, cp, CRYPTO_MEM_CHECK_MAX_FS);
md_failstring = md_failbuf;
parseit();
}
}
if ((cp = getenv("OPENSSL_MALLOC_FD")) != NULL) if ((cp = getenv("OPENSSL_MALLOC_FD")) != NULL)
md_tracefd = atoi(cp); md_tracefd = atoi(cp);
if ((cp = getenv("OPENSSL_MALLOC_SEED")) != NULL) if ((cp = getenv("OPENSSL_MALLOC_SEED")) != NULL)

3
doc/man3/OPENSSL_malloc.pod
View File

@ -171,7 +171,8 @@ It is a set of fields separated by semicolons, which each field is a count
to 100). If the count is zero, then it lasts forever. For example, to 100). If the count is zero, then it lasts forever. For example,
C<100;@25> or C<100@0;0@25> means the first 100 allocations pass, then all C<100;@25> or C<100@0;0@25> means the first 100 allocations pass, then all
other allocations (until the program exits or crashes) have a 25% chance of other allocations (until the program exits or crashes) have a 25% chance of
failing. failing. The length of the value of B<OPENSSL_MALLOC_FAILURES> must be 256 or
fewer characters.
If the variable B<OPENSSL_MALLOC_FD> is parsed as a positive integer, then If the variable B<OPENSSL_MALLOC_FD> is parsed as a positive integer, then
it is taken as an open file descriptor. This is used in conjunction with it is taken as an open file descriptor. This is used in conjunction with

3
include/openssl/crypto.h.in
View File

@ -368,6 +368,9 @@ void OPENSSL_cleanse(void *ptr, size_t len);
# define CRYPTO_MEM_CHECK_ENABLE 0x2 /* Control and mode bit */ # define CRYPTO_MEM_CHECK_ENABLE 0x2 /* Control and mode bit */
# define CRYPTO_MEM_CHECK_DISABLE 0x3 /* Control only */ # define CRYPTO_MEM_CHECK_DISABLE 0x3 /* Control only */
/* max allowed length for value of OPENSSL_MALLOC_FAILURES env var. */
# define CRYPTO_MEM_CHECK_MAX_FS 256
void CRYPTO_get_alloc_counts(int *mcount, int *rcount, int *fcount); void CRYPTO_get_alloc_counts(int *mcount, int *rcount, int *fcount);
# ifndef OPENSSL_NO_DEPRECATED_3_0 # ifndef OPENSSL_NO_DEPRECATED_3_0
# define OPENSSL_mem_debug_push(info) \ # define OPENSSL_mem_debug_push(info) \