From abfa13ebe92d81aaf66669c428d767847b577453 Mon Sep 17 00:00:00 2001
From: Christian Brabandt <cb@256bit.org>
Date: Thu, 30 Nov 2023 11:32:18 +0100
Subject: [PATCH] patch 9.0.2143: [security]: buffer-overflow in ex_substitute

Problem:  [security]: buffer-overflow in ex_substitute
Solution: clear memory after allocating

When allocating the new_start pointer in ex_substitute() the memory
pointer points to some garbage that the following for loop in
ex_cmds.c:4743 confuses and causes it to accessing the new_start pointer
beyond it's size, leading to a buffer-overlow.

So fix this by using alloc_clear() instead of alloc(), which will
clear the memory by NUL and therefore cause the loop to terminate
correctly.

Reported by @henices, thanks!

closes: #13596
Signed-off-by: Christian Brabandt <cb@256bit.org>
---
 src/ex_cmds.c                       |   4 ++--
 src/testdir/crash/poc_ex_substitute | Bin 0 -> 135 bytes
 src/testdir/test_crash.vim          |  13 ++++++++++++-
 src/version.c                       |   2 ++
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 src/testdir/crash/poc_ex_substitute

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index a08682b07..e311fa8e7 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4650,7 +4650,7 @@ ex_substitute(exarg_T *eap)
 		     * too many calls to alloc()/free()).
 		     */
 		    new_start_len = needed_len + 50;
-		    if ((new_start = alloc(new_start_len)) == NULL)
+		    if ((new_start = alloc_clear(new_start_len)) == NULL)
 			goto outofmem;
 		    *new_start = NUL;
 		    new_end = new_start;
@@ -4667,7 +4667,7 @@ ex_substitute(exarg_T *eap)
 		    if (needed_len > (int)new_start_len)
 		    {
 			new_start_len = needed_len + 50;
-			if ((p1 = alloc(new_start_len)) == NULL)
+			if ((p1 = alloc_clear(new_start_len)) == NULL)
 			{
 			    vim_free(new_start);
 			    goto outofmem;
diff --git a/src/testdir/crash/poc_ex_substitute b/src/testdir/crash/poc_ex_substitute
new file mode 100644
index 0000000000000000000000000000000000000000..bcf1286512f21a787dcd048ac1eb7f3611db47e3
GIT binary patch
literal 135
zcmXR;RY=WC&QHnAOSer)O)5=SuvAFp$|=!T;NmL&|DQpvm`h(%KSqJ8nE5}Ky=_rR
zP>y|BrUI7%SBW1?NoFor{)89|;iAP{>OiUN)YO6kg?tUof@B4*vSKcS;^d<L83GI`
Lsa#O1IG+mubIvNu

literal 0
HcmV?d00001

diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index 1d4f435e4..49e712a90 100644
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -117,7 +117,7 @@ func Test_crash1_2()
   " The following used to crash Vim
   let opts = #{cmd: 'sh'}
   let vim  = GetVimProg()
-  let result = 'X_crash1_1_result.txt'
+  let result = 'X_crash1_2_result.txt'
 
   let buf = RunVimInTerminal('sh', opts)
 
@@ -149,6 +149,17 @@ func Test_crash1_2()
     \ ' ; echo "crash 4: [OK]" >> '.. result .. "\<cr>")
   call TermWait(buf, 150)
 
+  let file = 'crash/poc_ex_substitute'
+  let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
+  let args = printf(cmn_args, vim, file)
+  " just make sure it runs, we don't care about the resulting echo
+  call term_sendkeys(buf, args .. "\<cr>")
+  " There is no output generated in Github CI for the asan clang build.
+  " so just skip generating the ouput.
+  " call term_sendkeys(buf, args ..
+  "   \ ' &&  echo "crash 5: [OK]" >> '.. result .. "\<cr>")
+  call TermWait(buf, 150)
+
   " clean up
   exe buf .. "bw!"
 
diff --git a/src/version.c b/src/version.c
index 28325a7fa..efa9dcd32 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2143,
 /**/
     2142,
 /**/