From: "cron2 (Code Review)" Date: Wed, 17 Jan 2024 09:38:55 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <67bd8c0cf8128f4ff1d155df2fd9df622756d357-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="a1kS9xCuasc="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[release/2.6]: NTLM: add length check to add_security_buffer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --a1kS9xCuasc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/49= 3?usp=3Demail ) Change subject: NTLM: add length check to add_security_buffer ...................................................................... NTLM: add length check to add_security_buffer Especially ntlmv2_response can be very big, so make sure we not do exceed the size of the phase3 buffer. Change-Id: Icea931d29e3e504e23e045539b21013b42172664 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20240117091711.5366-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 042.html Signed-off-by: Gert Doering --- M src/openvpn/ntlm.c 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c index 2e77214..2b735ec 100644 --- a/src/openvpn/ntlm.c +++ b/src/openvpn/ntlm.c @@ -167,8 +167,13 @@ static void add_security_buffer(int sb_offset, void *data, int length, - unsigned char *msg_buf, int *msg_bufpos) + unsigned char *msg_buf, int *msg_bufpos, size_t msg_bu= fsize) { + if (*msg_bufpos + length > msg_bufsize) + { + msg(M_WARN, "NTLM: security buffer too big for message buffer"); + return; + } /* Adds security buffer data to a message and sets security buffer's * offset and length */ msg_buf[sb_offset] =3D (unsigned char)length; @@ -396,20 +401,20 @@ if (ntlmv2_enabled) /* NTLMv2 response */ { add_security_buffer(0x14, ntlmv2_response, ntlmv2_blob_size + 16, - phase3, &phase3_bufpos); + phase3, &phase3_bufpos, sizeof(phase3)); } else /* NTLM response */ { - add_security_buffer(0x14, ntlm_response, 24, phase3, &phase3_bufpo= s); + add_security_buffer(0x14, ntlm_response, 24, phase3, &phase3_bufpo= s, sizeof(phase3)); } /* username in ascii */ add_security_buffer(0x24, username, strlen(username), phase3, - &phase3_bufpos); + &phase3_bufpos, sizeof(phase3)); /* Set domain. If is empty, default domain will be used * (i.e. proxy's domain) */ - add_security_buffer(0x1c, domain, strlen(domain), phase3, &phase3_bufp= os); + add_security_buffer(0x1c, domain, strlen(domain), phase3, &phase3_bufp= os, sizeof(phase3)); /* other security buffers will be empty */ phase3[0x10] =3D phase3_bufpos; /* lm not used */ -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/493?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: release/2.6 Gerrit-Change-Id: Icea931d29e3e504e23e045539b21013b42172664 Gerrit-Change-Number: 493 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --a1kS9xCuasc= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

NTLM: add length check to add_security_buffer<=
br>
Especially ntlmv2_response can be very big, so make sure
we not d= o exceed the size of the phase3 buffer.

Change-Id: Icea931d29e3e504e= 23e045539b21013b42172664
Signed-off-by: Frank Lichtenheld <frank@...1665...= 641...>
Acked-by: Gert Doering <gert@...1296...>
Message-Id:= <20240117091711.5366-1-gert@...1296...>
URL: https://www.mail-arc= hive.com/openvpn-devel@lists.sourceforge.net/msg28042.html
Signed-off-by= : Gert Doering <gert@...1296...>
---
M src/openvpn/ntlm.c
1 = file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c
ind= ex 2e77214..2b735ec 100644
--- a/src/openvpn/ntlm.c<= br>+++ b/src/openvpn/ntlm.c
@@ -167,8 +167,13 @@

static void
add_security_bu= ffer(int sb_offset, void *data, int length,
- unsigned char *msg_buf, int *msg_= bufpos)
+ = unsigned char *msg_buf, int *msg_bufpos, size_t msg_bufsize)=
{
+ if = (*msg_bufpos + length > msg_bufsize)
+ {
+ msg(M_WARN, "NTLM: security buffer too big for message b= uffer");
+ = return;
+ }
/* Adds security buffer data to a message and sets securit= y buffer's
* offset and length */
msg_buf[sb_offset] =3D (unsigned char)length;

@@ -396= ,20 +401,20 @@
if (ntlmv2_enabled) /* NTLMv2 resp= onse */
{
add_security_buffer= (0x14, ntlmv2_response, ntlmv2_blob_size + 16,
- phase3, &phase3_bu= fpos);
+ = phase3, &phase3_bufpos, sizeof(phase3));
}

else /* NTLM response */
{
- add_se= curity_buffer(0x14, ntlm_response, 24, phase3, &phase3_bufpos);<= br>+ add_security_buffer= (0x14, ntlm_response, 24, phase3, &phase3_bufpos, sizeof(phase3));
}

/* username in as= cii */
add_security_buffer(0x24, username, strlen(user= name), phase3,
- = &phase3_bufpos);
+ &phase3_bufpos, sizeof(phase3= ));

/* Set domain. If <domain>= is empty, default domain will be used
* (i.e. proxy&= #39;s domain) */
- a= dd_security_buffer(0x1c, domain, strlen(domain), phase3, &phase3_bufpos= );
+ add_security_= buffer(0x1c, domain, strlen(domain), phase3, &phase3_bufpos, sizeof(pha= se3));

/* other security buffers wil= l be empty */
phase3[0x10] =3D phase3_bufpos; /* l= m not used */

To view, visit change 493. To = unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Icea931d29e3e504e23e045539b2= 1013b42172664
Gerrit-Change-Number: 493
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--a1kS9xCuasc=--