From 15beb4b193b2714d88107e7dffca781798684e7e Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@gnu.org>
Date: Fri, 29 Jan 2021 14:06:05 +0100
Subject: [PATCH 1/2] key_share: avoid use-after-free around realloc

Signed-off-by: Daiki Ueno <ueno@gnu.org>
---
 lib/ext/key_share.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/ext/key_share.c b/lib/ext/key_share.c
index ab8abf8fe..a8c4bb5cf 100644
--- a/lib/ext/key_share.c
+++ b/lib/ext/key_share.c
@@ -664,14 +664,14 @@ key_share_send_params(gnutls_session_t session,
 {
 	unsigned i;
 	int ret;
-	unsigned char *lengthp;
-	unsigned int cur_length;
 	unsigned int generated = 0;
 	const gnutls_group_entry_st *group;
 	const version_entry_st *ver;
 
 	/* this extension is only being sent on client side */
 	if (session->security_parameters.entity == GNUTLS_CLIENT) {
+		unsigned int length_pos;
+
 		ver = _gnutls_version_max(session);
 		if (unlikely(ver == NULL || ver->key_shares == 0))
 			return 0;
@@ -679,16 +679,13 @@ key_share_send_params(gnutls_session_t session,
 		if (!have_creds_for_tls13(session))
 			return 0;
 
-		/* write the total length later */
-		lengthp = &extdata->data[extdata->length];
+		length_pos = extdata->length;
 
 		ret =
 		    _gnutls_buffer_append_prefix(extdata, 16, 0);
 		if (ret < 0)
 			return gnutls_assert_val(ret);
 
-		cur_length = extdata->length;
-
 		if (session->internals.hsk_flags & HSK_HRR_RECEIVED) { /* we know the group */
 			group = get_group(session);
 			if (unlikely(group == NULL))
@@ -736,7 +733,8 @@ key_share_send_params(gnutls_session_t session,
 		}
 
 		/* copy actual length */
-		_gnutls_write_uint16(extdata->length - cur_length, lengthp);
+		_gnutls_write_uint16(extdata->length - length_pos - 2,
+				     &extdata->data[length_pos]);
 
 	} else { /* server */
 		ver = get_version(session);
-- 
2.30.2

>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=b81c4c449283e3ad9dc456ece92ea8c15a239f1c'>root</a>/<a href='/guix/log/gnu?id=b81c4c449283e3ad9dc456ece92ea8c15a239f1c'>gnu</a>/<a href='/guix/log/gnu/packages?id=b81c4c449283e3ad9dc456ece92ea8c15a239f1c'>packages</a>/<a href='/guix/log/gnu/packages/browser-extensions.scm?id=b81c4c449283e3ad9dc456ece92ea8c15a239f1c'>browser-extensions.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/browser-extensions.scm?id=b81c4c449283e3ad9dc456ece92ea8c15a239f1c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-11-12 03:23:05 +0100'>2022-11-12</span></td><td><a href='/guix/commit/gnu/packages/browser-extensions.scm?id=8a261de34c773ab8f374b849e608dab5c434681f'>gnu: uBlock Origin: Update to 1.45.2.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-09-07 22:02:43 +0200'>2022-09-07</span></td><td><a href='/guix/commit/gnu/packages/browser-extensions.scm?id=b45a44eaad890f31d9418dbb8cb14e3ee1d83c19'>gnu: uBlock Origin: Update to 1.44.2.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-08-19 19:22:43 +0200'>2022-08-19</span></td><td><a href='/guix/commit/gnu/packages/browser-extensions.scm?id=712b931d5064f51f834c55a45f2dda4e934e72c4'>gnu: uBlock Origin: Update to 1.44.0.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-06-13 00:44:12 +0200'>2022-06-13</span></td><td><a href='/guix/commit/gnu/packages/browser-extensions.scm?id=d3d00b1b4f2875675999919fa7e892c36bfff4c6'>gnu: uBlock Origin: Update to 1.43.0.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-04-07 23:12:44 +0200'>2022-04-07</span></td><td><a href='/guix/commit/gnu/packages/browser-extensions.scm?id=cee03495bf6a0cbdee99fc0d77e4933b8ef861c3'>gnu: uBlock Origin: Update to 1.42.4.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-02-19 11:02:55 +0100'>2022-02-19</span></td><td><a href='/guix/commit/gnu/packages/browser-extensions.scm?id=10d707111be1cfdea683f01b35e7702c746e2c46'>gnu: uBlock Origin: Update to 1.41.6.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-02-16 23:02:05 +0100'>2022-02-16</span></td><td><a href='/guix/commit/gnu/packages/browser-extensions.scm?id=755c7c80825c150b5a8b38072bcfb78699f2fbf2'>gnu: uBlock Origin: Update to 1.41.4.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-02-11 23:54:31 +0100'>2022-02-11</span></td><td><a href='/guix/commit/gnu/packages/browser-extensions.scm?id=068d99978a0c9c6fb66f95455060c8d08ba55ac5'>gnu: uBlock Origin: Update to 1.41.2.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>