diff options
| author |   doug <doug@openbsd.org> | 2015-01-12 02:15:23 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2015-01-12 02:15:23 +0000 |
| commit | 506b1b69c2c6fdbffe678905864ee20ecc78f11d (patch) | |
| tree | 0cfce9e1c1c6854abc5333232222081176a8787c | |
| parent | stash the softc in the memory allocated for setting up a task for (diff) | |
| download | wireguard-openbsd-506b1b69c2c6fdbffe678905864ee20ecc78f11d.tar.xz wireguard-openbsd-506b1b69c2c6fdbffe678905864ee20ecc78f11d.zip | |
Fix a memory leak in bss_dgram.
Free data->saved_message.data. Based on OpenSSL commit:
41cd41c4416f545a18ead37e09e437c75fa07c95 except this version sets a->ptr
to NULL to avoid accidental reuse and handles malloc failing.
ok beck@, input + ok miod@
| -rw-r--r-- | lib/libcrypto/bio/bss_dgram.c | 16 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/bio/bss_dgram.c | 16 |
2 files changed, 26 insertions, 6 deletions
diff --git a/lib/libcrypto/bio/bss_dgram.c b/lib/libcrypto/bio/bss_dgram.c index c6b552eb322..ecf12fcb331 100644 --- a/lib/libcrypto/bio/bss_dgram.c +++ b/lib/libcrypto/bio/bss_dgram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_dgram.c,v 1.38 2015/01/03 18:07:29 doug Exp $ */ +/* $OpenBSD: bss_dgram.c,v 1.39 2015/01/12 02:15:23 doug Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -826,7 +826,11 @@ dgram_sctp_free(BIO *a) return 0; data = (bio_dgram_sctp_data *)a->ptr; - free(data); + if (data != NULL) { + free(data->saved_message.data); + free(data); + a->ptr = NULL; + } return (1); } @@ -934,6 +938,7 @@ dgram_sctp_read(BIO *b, char *out, int outl) dgram_sctp_write(data->saved_message.bio, data->saved_message.data, data->saved_message.length); free(data->saved_message.data); + data->saved_message.data = NULL; data->saved_message.length = 0; } @@ -1101,9 +1106,14 @@ dgram_sctp_write(BIO *b, const char *in, int inl) */ if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b)) { data->saved_message.bio = b; - data->saved_message.length = inl; + free(data->saved_message.data); data->saved_message.data = malloc(inl); + if (data->saved_message.data == NULL) { + data->_errno = ENOMEM; + return -1; + } memcpy(data->saved_message.data, in, inl); + data->saved_message.length = inl; return inl; } diff --git a/lib/libssl/src/crypto/bio/bss_dgram.c b/lib/libssl/src/crypto/bio/bss_dgram.c index c6b552eb322..ecf12fcb331 100644 --- a/lib/libssl/src/crypto/bio/bss_dgram.c +++ b/lib/libssl/src/crypto/bio/bss_dgram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_dgram.c,v 1.38 2015/01/03 18:07:29 doug Exp $ */ +/* $OpenBSD: bss_dgram.c,v 1.39 2015/01/12 02:15:23 doug Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -826,7 +826,11 @@ dgram_sctp_free(BIO *a) return 0; data = (bio_dgram_sctp_data *)a->ptr; - free(data); + if (data != NULL) { + free(data->saved_message.data); + free(data); + a->ptr = NULL; + } return (1); } @@ -934,6 +938,7 @@ dgram_sctp_read(BIO *b, char *out, int outl) dgram_sctp_write(data->saved_message.bio, data->saved_message.data, data->saved_message.length); free(data->saved_message.data); + data->saved_message.data = NULL; data->saved_message.length = 0; } @@ -1101,9 +1106,14 @@ dgram_sctp_write(BIO *b, const char *in, int inl) */ if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b)) { data->saved_message.bio = b; - data->saved_message.length = inl; + free(data->saved_message.data); data->saved_message.data = malloc(inl); + if (data->saved_message.data == NULL) { + data->_errno = ENOMEM; + return -1; + } memcpy(data->saved_message.data, in, inl); + data->saved_message.length = inl; return inl; } |