diff options
| author |   Thiruvadi Rajaraman <trajaraman@mvista.com> | 2017-08-30 13:25:14 +0530 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2017-11-16 15:30:30 -0800 |
| commit | 9c02fc70afe1edadc02d9201a99543e05b119738 (patch) | |
| tree | f53b2806151390183b0e87d393b93a51ad30f5ba | |
| parent | 64ed22f0354927bf22bf8aea246ffc74909b3ebc (diff) | |
| download | meta-openembedded-contrib-9c02fc70afe1edadc02d9201a99543e05b119738.tar.gz | |
php: CVE-2017-9228
Source: https://github.com/kkos/oniguruma
MR: 74853
Type: Security Fix
Disposition: Backport from oniguruma-v6.3.0
ChangeID: 9ee6052341bbd1f64ea5e403528e4a8729c633a8
Description:
fix #60 : invalid state(CCS_VALUE) in parse_char_class()
Author: K.Kosako <kosako@sofnec.co.jp>
Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com>
Reviewed-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/php/php-5.6.26/CVE-2017-9228.patch | 27 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_5.6.26.bb | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/php/php-5.6.26/CVE-2017-9228.patch b/meta-oe/recipes-devtools/php/php-5.6.26/CVE-2017-9228.patch new file mode 100644 index 0000000000..3c06207eaa --- /dev/null +++ b/meta-oe/recipes-devtools/php/php-5.6.26/CVE-2017-9228.patch @@ -0,0 +1,27 @@ +commit 3b63d12038c8d8fc278e81c942fa9bec7c704c8b +Author: K.Kosako <kosako@sofnec.co.jp> +Date: Wed May 24 13:43:25 2017 +0900 + + fix #60 : invalid state(CCS_VALUE) in parse_char_class() + +Upstream-Status: Backport + +CVE: CVE-2017-9228 +Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com> + + +Index: php-5.6.26/ext/mbstring/oniguruma/regparse.c +=================================================================== +--- php-5.6.26.orig/ext/mbstring/oniguruma/regparse.c 2016-09-16 02:32:50.000000000 +0530 ++++ php-5.6.26/ext/mbstring/oniguruma/regparse.c 2017-08-30 12:52:50.468290561 +0530 +@@ -4068,7 +4068,9 @@ + } + } + +- *state = CCS_VALUE; ++ if (*state != CCS_START) ++ *state = CCS_VALUE; ++ + *type = CCV_CLASS; + return 0; + } 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 3a383381f7..5055a940ee 100644 --- a/meta-oe/recipes-devtools/php/php_5.6.26.bb +++ b/meta-oe/recipes-devtools/php/php_5.6.26.bb @@ -8,6 +8,7 @@ SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ file://CVE-2016-9935.patch \ file://CVE-2016-9933.patch \ file://CVE-2017-9227.patch \ + file://CVE-2017-9228.patch \ " SRC_URI[md5sum] = "cb424b705cfb715fc04f499f8a8cf52e" SRC_URI[sha256sum] = "d47aab8083a4284b905777e1b45dd7735adc53be827b29f896684750ac8b6236" |