diff options
| author | Daiki Ueno <ueno@gnu.org> | 2021-01-29 14:06:50 +0100 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2021-04-04 10:20:59 +0200 |
| commit | 9bdb7bb60ebddaa8f167e5cfae317dbf202f0e67 (patch) | |
| tree | b04db780c79ed73297090118e884b07d9c3ae731 | |
| parent | 254ee88e6f20975604b9247d1764c3fcbac448ee (diff) | |
| download | gnutls-9bdb7bb60ebddaa8f167e5cfae317dbf202f0e67.tar.gz | |
pre_shared_key: avoid use-after-free around realloc
Signed-off-by: Daiki Ueno <ueno@gnu.org>
| -rw-r--r-- | lib/ext/pre_shared_key.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/ext/pre_shared_key.c b/lib/ext/pre_shared_key.c index 240be21625..c66b40e9fd 100644 --- a/lib/ext/pre_shared_key.c +++ b/lib/ext/pre_shared_key.c @@ -267,7 +267,7 @@ client_send_params(gnutls_session_t session, size_t spos; gnutls_datum_t username = {NULL, 0}; gnutls_datum_t user_key = {NULL, 0}, rkey = {NULL, 0}; - gnutls_datum_t client_hello; + unsigned client_hello_len; unsigned next_idx; const mac_entry_st *prf_res = NULL; const mac_entry_st *prf_psk = NULL; @@ -430,8 +430,7 @@ client_send_params(gnutls_session_t session, assert(extdata->length >= sizeof(mbuffer_st)); assert(ext_offset >= (ssize_t)sizeof(mbuffer_st)); ext_offset -= sizeof(mbuffer_st); - client_hello.data = extdata->data+sizeof(mbuffer_st); - client_hello.size = extdata->length-sizeof(mbuffer_st); + client_hello_len = extdata->length-sizeof(mbuffer_st); next_idx = 0; @@ -442,6 +441,11 @@ client_send_params(gnutls_session_t session, } if (prf_res && rkey.size > 0) { + gnutls_datum_t client_hello; + + client_hello.data = extdata->data+sizeof(mbuffer_st); + client_hello.size = client_hello_len; + ret = compute_psk_binder(session, prf_res, binders_len, binders_pos, ext_offset, &rkey, &client_hello, 1, @@ -476,6 +480,11 @@ client_send_params(gnutls_session_t session, } if (prf_psk && user_key.size > 0 && info) { + gnutls_datum_t client_hello; + + client_hello.data = extdata->data+sizeof(mbuffer_st); + client_hello.size = client_hello_len; + ret = compute_psk_binder(session, prf_psk, binders_len, binders_pos, ext_offset, &user_key, &client_hello, 0, |