CVE-2023-48233: Integer Overflow or Wraparound (CWE-190)
value: Vim is an open source command line text editor. If the count after the :s command is larger than what fits into a (signed) long variable, abort with e_value_too_large. Impact is low, user interaction is required and a crash may not even happen in all situations. This issue has been addressed in commit `ac6378773` which has been included in release version 9.0.2108. Users are advised to upgrade. There are no known workarounds for this vulnerability.
CWE description: The product performs a calculation that can
         produce an integer overflow or wraparound when the logic
         assumes that the resulting value will always be larger than
         the original value. This occurs when an integer value is
         incremented to a value that is too large to store in the
         associated representation. When this occurs, the value may
         become a very small or negative number.
CVSS v3 base score: 4.3
Published: 2023-11-16T23:15Z
Repository: https://github.com/vim/vim
Language: C
Files changed: runtime/doc/change.txt, runtime/doc/cmdline.txt, runtime/doc/tags, src/ex_cmds.c, src/testdir/test_substitute.vim, src/version.c
Commit date: 2023-11-16 22:04:37 +0100
Commit message: patch 9.0.2108: [security]: overflow with count for :s command

Problem:  [security]: overflow with count for :s command
Solution: Abort the :s command if the count is too large

If the count after the :s command is larger than what fits into a
(signed) long variable, abort with e_value_too_large.

Adds a test with INT_MAX as count and verify it correctly fails.

It seems the return value on Windows using mingw compiler wraps around,
so the initial test using :s/./b/9999999999999999999999999990 doesn't
fail there, since the count is wrapping around several times and finally
is no longer larger than 2147483647. So let's just use 2147483647 in the
test, which hopefully will always cause a failure

Signed-off-by: Christian Brabandt <cb@256bit.org>

Diff: diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 65da9a7c6b92..dccaa44c8992 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,6 +1,6 @@
-*change.txt*    For Vim version 9.0.  Last change: 2023 Sep 19
+*change.txt*    For Vim version 9.0.  Last change: 2023 Nov 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 
 
@@ -642,13 +642,13 @@ For other systems the tmpnam() library function is used.
 			special; see |sub-replace-special|.
 			When [range] and [count] are omitted, replace in the
 			current line only.  When [count] is given, replace in
 			[count] lines, starting with the last line in [range].
 			When [range] is omitted start in the current line.
-							*E939*
-			[count] must be a positive number.  Also see
-			|cmdline-ranges|.
+							*E939* *E1510*
+			[count] must be a positive number (max 2147483647)
+			Also see |cmdline-ranges|.
 
 			See |:s_flags| for [flags].
 			The delimiter doesn't need to be /, see
 			|pattern-delimiter|.
 
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index c5d0096ddb74..cbcf0ad274fe 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,6 +1,6 @@
-*cmdline.txt*   For Vim version 9.0.  Last change: 2023 May 20
+*cmdline.txt*   For Vim version 9.0.  Last change: 2023 Nov 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 
 
@@ -360,10 +360,11 @@ terminals)
 		be specified in the following form:
 							*:history-indexing*
 		A positive number represents the absolute index of an entry
 		as it is given in the first column of a :history listing.
 		This number remains fixed even if other entries are deleted.
+		(see |E1510|)
 
 		A negative number means the relative position of an entry,
 		counted from the newest entry (which has index -1) backwards.
 
 		Examples:
diff --git a/runtime/doc/tags b/runtime/doc/tags
index f49061aa2106..0021ddb12779 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4512,10 +4512,11 @@ E1505	builtin.txt	/*E1505*
 E1506	editing.txt	/*E1506*
 E1507	builtin.txt	/*E1507*
 E1508	editing.txt	/*E1508*
 E1509	editing.txt	/*E1509*
 E151	helphelp.txt	/*E151*
+E1510	change.txt	/*E1510*
 E152	helphelp.txt	/*E152*
 E153	helphelp.txt	/*E153*
 E154	helphelp.txt	/*E154*
 E155	sign.txt	/*E155*
 E156	sign.txt	/*E156*
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 3544092d65b1..c5f912e7ee57 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3991,10 +3991,17 @@ ex_substitute(exarg_T *eap)
 	if (i <= 0 && !eap->skip && subflags.do_error)
 	{
 	    emsg(_(e_positive_count_required));
 	    return;
 	}
+	else if (i >= INT_MAX)
+	{
+	    char	buf[20];
+	    vim_snprintf(buf, sizeof(buf), "%ld", i);
+	    semsg(_(e_val_too_large), buf);
+	    return;
+	}
 	eap->line1 = eap->line2;
 	eap->line2 += i - 1;
 	if (eap->line2 > curbuf->b_ml.ml_line_count)
 	    eap->line2 = curbuf->b_ml.ml_line_count;
     }
diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim
index b99d0e005827..3ed159799f5c 100644
--- a/src/testdir/test_substitute.vim
+++ b/src/testdir/test_substitute.vim
@@ -204,10 +204,11 @@ func Test_substitute_count()
   call setline(1, ['foo foo', 'foo foo', 'foo foo', 'foo foo', 'foo foo'])
   2,4s/foo/bar/ 10
   call assert_equal(['foo foo', 'foo foo', 'foo foo', 'bar foo', 'bar foo'],
         \           getline(1, '$'))
 
+  call assert_fails('s/./b/2147483647', 'E1510:')
   bwipe!
 endfunc
 
 " Test substitute 'n' flag (report number of matches, do not substitute).
 func Test_substitute_flag_n()
diff --git a/src/version.c b/src/version.c
index 684f3acf4c0f..16db8f231289 100644
--- a/src/version.c
+++ b/src/version.c
@@ -702,10 +702,12 @@ static char *(features[]) =
 	NULL
 };
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2108,
 /**/
     2107,
 /**/
     2106,
 /**/

Vulnerable code: *change.txt*    For Vim version 9.0.  Last change: 2023 Sep 19
							*E939*
			[count] must be a positive number.  Also see
			|cmdline-ranges|.
*cmdline.txt*   For Vim version 9.0.  Last change: 2023 May 20
Fixed code: *change.txt*    For Vim version 9.0.  Last change: 2023 Nov 15
							*E939* *E1510*
			[count] must be a positive number (max 2147483647)
			Also see |cmdline-ranges|.
*cmdline.txt*   For Vim version 9.0.  Last change: 2023 Nov 15
		(see |E1510|)
E1510	change.txt	/*E1510*
	else if (i >= INT_MAX)
	{
	    char	buf[20];
	    vim_snprintf(buf, sizeof(buf), "%ld", i);
	    semsg(_(e_val_too_large), buf);
	    return;
	}
  call assert_fails('s/./b/2147483647', 'E1510:')
/**/
    2108,