From: "flichtenheld (Code Review)" Date: Fri, 12 Jan 2024 14:14:05 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <320bdf33a7061a119b72f102b23372cad33a6722-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="Z6YF/KpcEr0="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: NTLM: add length check to add_security_buffer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --Z6YF/KpcEr0= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/496?usp=3Demail to review the following change. 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 --- M src/openvpn/ntlm.c 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/96/496/1 diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c index bc33f41..99d4ae7 100644 --- a/src/openvpn/ntlm.c +++ b/src/openvpn/ntlm.c @@ -154,8 +154,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; @@ -362,15 +367,15 @@ /* NTLMv2 response */ add_security_buffer(0x14, ntlmv2_response, ntlmv2_blob_size + 16, - phase3, &phase3_bufpos); + phase3, &phase3_bufpos, 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/+/496?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Icea931d29e3e504e23e045539b21013b42172664 Gerrit-Change-Number: 496 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --Z6YF/KpcEr0= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

Vi= ew Change

NTLM: add length check to add_security_buffer

Especial= ly ntlmv2_response can be very big, so make sure
we not do exceed the si= ze of the phase3 buffer.

Change-Id: Icea931d29e3e504e23e045539b21013= b42172664
Signed-off-by: Frank Lichtenheld <frank@...2641...>
-= --
M src/openvpn/ntlm.c
1 file changed, 9 insertions(+), 4 deletions(= -)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/9=
6/496/1
diff --git a/src/openvpn/ntlm.c b/src/openvpn/ntlm.c=

index bc33f41..99d4ae7 100644
--- a/src/openvpn/n= tlm.c
+++ b/src/openvpn/ntlm.c
@@ -154,8 +1= 54,13 @@

static void
ad= d_security_buffer(int sb_offset, void *data, int length,
- unsigned char *msg_b= uf, 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 an= d sets security buffer's
* offset and length */
msg_buf[sb_offset] =3D (unsigned char)length;@@ -362,15 +367,15 @@

/* NTLM= v2 response */
add_security_buffer(0x14, ntlmv2_respon= se, ntlmv2_blob_size + 16,
- phase3, &phase3_bufpos);
+ phase3, &= phase3_bufpos, sizeof(phase3));

/* u= sername in ascii */
add_security_buffer(0x24, username= , strlen(username), phase3,
- &phase3_bufpos);
+ &phase3_bufpos, = sizeof(phase3));

/* Set domain. If &= lt;domain> is empty, default domain will be used
*= (i.e. proxy's domain) */
- add_security_buffer(0x1c, domain, strlen(domain), phase3, &= phase3_bufpos);
+ = add_security_buffer(0x1c, domain, strlen(domain), phase3, &phase3_bufpo= s, sizeof(phase3));

/* other securit= y buffers will be empty */
phase3[0x10] =3D phase3_buf= pos; /* lm not used */

To view, vis= it change= 496. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Icea931d29e3e504e23e045539b2= 1013b42172664
Gerrit-Change-Number: 496
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-MessageType: newchange
--Z6YF/KpcEr0=--