[oe-commits] [meta-openembedded] 15/19: php: CVE-2017-9226

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch akuster/morty-next
in repository meta-openembedded.

commit 73079774da16629aaa6a93940f9994009d790a40
Author: Thiruvadi Rajaraman <trajaraman at mvista.com>
AuthorDate: Tue Sep 19 19:57:19 2017 +0530

    php: CVE-2017-9226
    
    Source: https://github.com/kkos/oniguruma/
    MR: 74855
    Type: Security Fix
    Disposition: Backport from oniguruma-v6.3.0
    ChangeID: 9ffd46b3694a88bb943c0b407311ad549d624ac5
    Description:
    
    The byte value expressed in octal must be smaller than 256
    
    Author: K.Kosako <kosako at sofnec.co.jp>
    Signed-off-by: Thiruvadi Rajaraman <trajaraman at mvista.com>
    Reviewed-by: Armin Kuster <akuster at mvista.com>
    Signed-off-by: Armin Kuster <akuster at mvista.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../php/php-5.6.26/CVE-2017-9226.patch             | 34 ++++++++++++++++++++++
 meta-oe/recipes-devtools/php/php_5.6.26.bb         |  2 ++
 2 files changed, 36 insertions(+)

diff --git a/meta-oe/recipes-devtools/php/php-5.6.26/CVE-2017-9226.patch b/meta-oe/recipes-devtools/php/php-5.6.26/CVE-2017-9226.patch
new file mode 100644
index 0000000..2996a92
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php-5.6.26/CVE-2017-9226.patch
@@ -0,0 +1,34 @@
+commit f015fbdd95f76438cd86366467bb2b39870dd7c6
+Author: K.Kosako <kosako at sofnec.co.jp>
+Date:   Fri May 19 15:44:47 2017 +0900
+
+    fix #55 : Byte value expressed in octal must be smaller than 256
+
+Upstream-Status: Backport
+
+CVE: CVE-2017-9226
+Signed-off-by: Thiruvadi Rajaraman <tajaraman at mvista.com>
+
+
+Index: php-5.6.26/ext/mbstring/oniguruma/regparse.c
+===================================================================
+--- php-5.6.26.orig/ext/mbstring/oniguruma/regparse.c	2017-09-19 19:41:03.440731438 +0530
++++ php-5.6.26/ext/mbstring/oniguruma/regparse.c	2017-09-19 19:41:56.952835081 +0530
+@@ -3064,7 +3064,7 @@
+ 	PUNFETCH;
+ 	prev = p;
+ 	num = scan_unsigned_octal_number(&p, end, 3, enc);
+-	if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
++	if (num < 0 || num >= 256) return ONIGERR_TOO_BIG_NUMBER;
+ 	if (p == prev) {  /* can't read nothing. */
+ 	  num = 0; /* but, it's not error */
+ 	}
+@@ -3436,7 +3436,7 @@
+       if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_OCTAL3)) {
+ 	prev = p;
+ 	num = scan_unsigned_octal_number(&p, end, (c == '0' ? 2:3), enc);
+-	if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
++	if (num < 0 || num >= 256) return ONIGERR_TOO_BIG_NUMBER;
+ 	if (p == prev) {  /* can't read nothing. */
+ 	  num = 0; /* but, it's not error */
+ 	}
diff --git a/meta-oe/recipes-devtools/php/php_5.6.26.bb b/meta-oe/recipes-devtools/php/php_5.6.26.bb
index 5055a94..7cf066b 100644
--- a/meta-oe/recipes-devtools/php/php_5.6.26.bb
+++ b/meta-oe/recipes-devtools/php/php_5.6.26.bb
@@ -9,6 +9,8 @@ SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
 	    file://CVE-2016-9933.patch \
 	    file://CVE-2017-9227.patch \
 	    file://CVE-2017-9228.patch \
+	    file://CVE-2017-9226.patch \
+
 "
 SRC_URI[md5sum] = "cb424b705cfb715fc04f499f8a8cf52e"
 SRC_URI[sha256sum] = "d47aab8083a4284b905777e1b45dd7735adc53be827b29f896684750ac8b6236"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.