wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

wolfcrypt/src/logging.c: in WOLFSSL_BUFFER(), on averted overrun, log a buffer error rather than silently failing; in wc_backtrace_render(), fix !WOLFSSL_MUTEX_INITIALIZER race mitigation code.

Browse Source
This commit is contained in:
Daniel Pouzzner
2024-08-08 10:49:05 -05:00
parent f5e775fe95
commit 24e34aa41a
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wolfcrypt/src/logging.c
View File

@ -474,7 +474,7 @@ void WOLFSSL_BUFFER(const byte* buffer, word32 length)
if (XSNPRINTF(&line[bufidx], sizeof(line)-bufidx, "\t") if (XSNPRINTF(&line[bufidx], sizeof(line)-bufidx, "\t")
>= (int)sizeof(line) - bufidx) >= (int)sizeof(line) - bufidx)
{ {
return; goto errout;
} }
bufidx++; bufidx++;
@ -483,14 +483,14 @@ void WOLFSSL_BUFFER(const byte* buffer, word32 length)
if (XSNPRINTF(&line[bufidx], sizeof(line)-bufidx, "%02x ", if (XSNPRINTF(&line[bufidx], sizeof(line)-bufidx, "%02x ",
buffer[i]) >= (int)sizeof(line) - bufidx) buffer[i]) >= (int)sizeof(line) - bufidx)
{ {
return; goto errout;
} }
} }
else { else {
if (XSNPRINTF(&line[bufidx], sizeof(line)-bufidx, " ") if (XSNPRINTF(&line[bufidx], sizeof(line)-bufidx, " ")
>= (int)sizeof(line) - bufidx) >= (int)sizeof(line) - bufidx)
{ {
return; goto errout;
} }
} }
bufidx += 3; bufidx += 3;
@ -499,7 +499,7 @@ void WOLFSSL_BUFFER(const byte* buffer, word32 length)
if (XSNPRINTF(&line[bufidx], sizeof(line)-bufidx, "| ") if (XSNPRINTF(&line[bufidx], sizeof(line)-bufidx, "| ")
>= (int)sizeof(line) - bufidx) >= (int)sizeof(line) - bufidx)
{ {
return; goto errout;
} }
bufidx++; bufidx++;
@ -511,7 +511,7 @@ void WOLFSSL_BUFFER(const byte* buffer, word32 length)
: '.') : '.')
>= (int)sizeof(line) - bufidx) >= (int)sizeof(line) - bufidx)
{ {
return; goto errout;
} }
bufidx++; bufidx++;
} }
@ -521,6 +521,12 @@ void WOLFSSL_BUFFER(const byte* buffer, word32 length)
buffer += LINE_LEN; buffer += LINE_LEN;
buflen -= LINE_LEN; buflen -= LINE_LEN;
} }
return;
errout:
wolfssl_log(INFO_LOG, NULL, 0, "\t[Buffer error while rendering]");
} }
#undef WOLFSSL_ENTER /* undo WOLFSSL_DEBUG_CODEPOINTS wrapper */ #undef WOLFSSL_ENTER /* undo WOLFSSL_DEBUG_CODEPOINTS wrapper */
@ -1799,18 +1805,23 @@ static int backtrace_init(struct backtrace_state **backtrace_state) {
} }
void wc_backtrace_render(void) { void wc_backtrace_render(void) {
static wolfSSL_Mutex backtrace_mutex WOLFSSL_MUTEX_INITIALIZER_CLAUSE(backtrace_mutex); static wolfSSL_Mutex backtrace_mutex
WOLFSSL_MUTEX_INITIALIZER_CLAUSE(backtrace_mutex);
static struct backtrace_state *backtrace_state = NULL; static struct backtrace_state *backtrace_state = NULL;
int depth = 0; int depth = 0;
#ifndef WOLFSSL_MUTEX_INITIALIZER #ifndef WOLFSSL_MUTEX_INITIALIZER
static wolfSSL_Atomic_Int init_count = 0; static wolfSSL_Atomic_Int init_count = 0;
if (init_count != 1) { if (init_count != 1) {
if (wolfSSL_Atomic_Int_FetchSub(&init_count, 1) != -1) int cur_init_count = wolfSSL_Atomic_Int_FetchSub(&init_count, 1);
if (cur_init_count != 0) {
(void)wolfSSL_Atomic_Int_FetchAdd(&init_count, 1);
return; return;
}
if (wc_InitMutex(&backtrace_mutex) != 0) if (wc_InitMutex(&backtrace_mutex) != 0)
return; return;
init_count = 1; /* set init_count to 1, race-free: (-1) - (0-2) = 1 */
(void)wolfSSL_Atomic_Int_FetchSub(&init_count, cur_init_count - 2);
} }
#endif #endif