From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 21 Jan 2019 19:08:13 +0000 (-0800)
Subject: regex: fix read overrun [BZ #24114]
X-Git-Tag: glibc-2.30~414
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=583dd860d5b833037175247230a328f0050dbfe9;p=thirdparty%2Fglibc.git

regex: fix read overrun [BZ #24114]

Problem found by AddressSanitizer, reported by Hongxu Chen in:
https://debbugs.gnu.org/34140
* posix/regexec.c (proceed_next_node):
Do not read past end of input buffer.
---

diff --git a/ChangeLog b/ChangeLog
index 05e13e65f02..62d732e6e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	regex: fix read overrun [BZ #24114]
+	Problem found by AddressSanitizer, reported by Hongxu Chen in:
+	https://debbugs.gnu.org/34140
+	* posix/regexec.c (proceed_next_node):
+	Do not read past end of input buffer.
+
 2019-01-31  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #24059]
@@ -18002,7 +18010,7 @@
 	(CFLAGS-wcstof_l.c): Likewise.
 	(CPPFLAGS-tst-wchar-h.c): Likewise.
 	(CPPFLAGS-wcstold_l.c): Likewise.
----
+
 2017-12-11  Paul A. Clarke  <pc@us.ibm.com>
 
 	* sysdeps/ieee754/flt-32/s_cosf.c: New implementation.
diff --git a/posix/regexec.c b/posix/regexec.c
index 91d5a797b82..084b1222d95 100644
--- a/posix/regexec.c
+++ b/posix/regexec.c
@@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
 	      else if (naccepted)
 		{
 		  char *buf = (char *) re_string_get_buffer (&mctx->input);
-		  if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
-			      naccepted) != 0)
+		  if (mctx->input.valid_len - *pidx < naccepted
+		      || (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
+				  naccepted)
+			  != 0))
 		    return -1;
 		}
 	    }