diff options
| author |   Thiruvadi Rajaraman <trajaraman@mvista.com> | 2017-09-19 20:01:19 +0530 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2017-11-16 15:31:26 -0800 |
| commit | 03d6f8c4a08ca1f10a8c31161201960c7850025b (patch) | |
| tree | f827aa5483a292c8aaae97619aa9c176b78593ec | |
| parent | 73079774da16629aaa6a93940f9994009d790a40 (diff) | |
| download | meta-openembedded-contrib-03d6f8c4a08ca1f10a8c31161201960c7850025b.tar.gz | |
php: CVE-2017-9229
Source: https://github.com/kkos/oniguruma
MR: 74856
Type: Security Fix
Disposition: Backport from oniguruma-v6.3
ChangeID: 8560428b9d675202266dde31373ce49757ba05be
Description:
fix #59 : access to invalid address by reg->dmax value
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-9229.patch | 37 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_5.6.26.bb | 2 |
2 files changed, 38 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/php/php-5.6.26/CVE-2017-9229.patch b/meta-oe/recipes-devtools/php/php-5.6.26/CVE-2017-9229.patch new file mode 100644 index 0000000000..d9ed8be1a8 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php-5.6.26/CVE-2017-9229.patch @@ -0,0 +1,37 @@ +commit b690371bbf97794b4a1d3f295d4fb9a8b05d402d +Author: K.Kosako <kosako@sofnec.co.jp> +Date: Wed May 24 10:27:04 2017 +0900 + + fix #59 : access to invalid address by reg->dmax value + +Upstream-Status: Backport + +CVE: CVE-2017-9229 +Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com> + + +Index: php-5.6.26/ext/mbstring/oniguruma/regexec.c +=================================================================== +--- php-5.6.26.orig/ext/mbstring/oniguruma/regexec.c 2017-09-19 19:45:51.001205292 +0530 ++++ php-5.6.26/ext/mbstring/oniguruma/regexec.c 2017-09-19 19:51:46.193527423 +0530 +@@ -3209,6 +3209,12 @@ + } + else { + if (reg->dmax != ONIG_INFINITE_DISTANCE) { ++ if (p - str < reg->dmax) { ++ *low = (UChar* )str; ++ if (low_prev) ++ *low_prev = onigenc_get_prev_char_head(reg->enc, str, *low); ++ } ++ else { + *low = p - reg->dmax; + if (*low > s) { + *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s, +@@ -3223,6 +3229,7 @@ + (pprev ? pprev : str), *low); + } + } ++ } + } + /* no needs to adjust *high, *high is used as range check only */ + *high = p - reg->dmin; 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 7cf066bad6..9866e2e775 100644 --- a/meta-oe/recipes-devtools/php/php_5.6.26.bb +++ b/meta-oe/recipes-devtools/php/php_5.6.26.bb @@ -10,7 +10,7 @@ SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ file://CVE-2017-9227.patch \ file://CVE-2017-9228.patch \ file://CVE-2017-9226.patch \ - + file://CVE-2017-9229.patch \ " SRC_URI[md5sum] = "cb424b705cfb715fc04f499f8a8cf52e" SRC_URI[sha256sum] = "d47aab8083a4284b905777e1b45dd7735adc53be827b29f896684750ac8b6236" |