mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

trace: don't leak the line prefix

Browse Source 
The openssl app registers trace callbacks which automatically
set a line prefix in the OSSL_TRACE_CTRL_BEGIN callback.
This prefix needs to be cleared in the OSSL_TRACE_CTRL_END
callback, otherwise a memory leak is reported when openssl
is built with crypto-mdebug enabled.

This leak causes the tests to fail when tracing and memory
debugging are enabled.

The leak can be observed by any command that produces trace
output, e.g. by

  OPENSSL_TRACE=ANY util/shlib_wrap.sh  apps/openssl version
  ...
  [00:19:14]  4061 file=apps/bf_prefix.c, line=152, ...
  26 bytes leaked in 1 chunks

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8463)
This commit is contained in:
Dr. Matthias St. Pierre 2019-03-12 23:04:14 +01:00
parent 5afb177c3c
commit 13d06925e8
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
apps/openssl.c
View File

@ -126,30 +126,17 @@ typedef struct tracedata_st {
static size_t internal_trace_cb(const char *buf, size_t cnt, static size_t internal_trace_cb(const char *buf, size_t cnt,
int category, int cmd, void *vdata) int category, int cmd, void *vdata)
{ {
int ret; int ret = 0;
tracedata *trace_data = vdata; tracedata *trace_data = vdata;
int set_prefix = 0; union {
CRYPTO_THREAD_ID tid;
unsigned long ltid;
} tid;
char buffer[256];
switch (cmd) { switch (cmd) {
case OSSL_TRACE_CTRL_BEGIN: case OSSL_TRACE_CTRL_BEGIN:
trace_data->ingroup = 1; trace_data->ingroup = 1;
set_prefix = 1;
break;
case OSSL_TRACE_CTRL_DURING:
if (!trace_data->ingroup)
set_prefix = 1;
break;
case OSSL_TRACE_CTRL_END:
trace_data->ingroup = 0;
break;
}
if (set_prefix) {
union {
CRYPTO_THREAD_ID tid;
unsigned long ltid;
} tid;
char buffer[256];
tid.ltid = 0; tid.ltid = 0;
tid.tid = CRYPTO_THREAD_get_current_id(); tid.tid = CRYPTO_THREAD_get_current_id();
@ -158,8 +145,17 @@ static size_t internal_trace_cb(const char *buf, size_t cnt,
OSSL_trace_get_category_name(category)); OSSL_trace_get_category_name(category));
BIO_ctrl(trace_data->bio, PREFIX_CTRL_SET_PREFIX, BIO_ctrl(trace_data->bio, PREFIX_CTRL_SET_PREFIX,
strlen(buffer), buffer); strlen(buffer), buffer);
break;
case OSSL_TRACE_CTRL_WRITE:
ret = BIO_write(trace_data->bio, buf, cnt);
break;
case OSSL_TRACE_CTRL_END:
trace_data->ingroup = 0;
BIO_ctrl(trace_data->bio, PREFIX_CTRL_SET_PREFIX, 0, NULL);
break;
} }
ret = BIO_write(trace_data->bio, buf, cnt);
return ret < 0 ? 0 : ret; return ret < 0 ? 0 : ret;
} }

2
crypto/trace.c
View File

@ -65,7 +65,7 @@ static int trace_write(BIO *channel,
const char *buf, size_t num, size_t *written) const char *buf, size_t num, size_t *written)
{ {
struct trace_data_st *ctx = BIO_get_data(channel); struct trace_data_st *ctx = BIO_get_data(channel);
size_t cnt = ctx->callback(buf, num, ctx->category, OSSL_TRACE_CTRL_DURING, size_t cnt = ctx->callback(buf, num, ctx->category, OSSL_TRACE_CTRL_WRITE,
ctx->data); ctx->data);
*written = cnt; *written = cnt;

2
include/openssl/trace.h
View File

@ -95,7 +95,7 @@ typedef size_t (*OSSL_trace_cb)(const char *buffer, size_t count,
* Possible |cmd| numbers. * Possible |cmd| numbers.
*/ */
# define OSSL_TRACE_CTRL_BEGIN 0 # define OSSL_TRACE_CTRL_BEGIN 0
# define OSSL_TRACE_CTRL_DURING 1 # define OSSL_TRACE_CTRL_WRITE 1
# define OSSL_TRACE_CTRL_END 2 # define OSSL_TRACE_CTRL_END 2
/* /*