diff options
| author |   Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 2020-12-15 15:22:57 +0800 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2021-01-10 19:43:09 -0800 |
| commit | 8d4826f656e07802cb7c2455164855aa0c5fee9c (patch) | |
| tree | 65baa7c47fc05f14a629f65873798c74699c3bde /meta-oe/recipes-devtools/php | |
| parent | cf29a55578192461dd86084c78e32fe8fba73eee (diff) | |
| download | meta-openembedded-8d4826f656e07802cb7c2455164855aa0c5fee9c.tar.gz | |
php: CVE-2020-7070
Security Advisory
References
https://nvd.nist.gov/vuln/detail/CVE-2020-7070
https://bugs.php.net/patch-display.php?bug=79699&patch=fix-urldecode&revision=1600650364
https://github.com/php/php-src/blob/master/main/php_variables.c
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit aff8a1fefb9a1a311e5ba14ad69871514270803a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
(cherry picked from commit 09f5a2ac5ab8550f5f0bd05417f2f54d27995dac)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php')
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch | 24 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_7.4.9.bb | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch b/meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch new file mode 100644 index 0000000000..e5b527f989 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/CVE-2020-7070.patch @@ -0,0 +1,24 @@ +Subject: Patch fix-urldecode for HTTP related Bug #79699 + +--- + main/php_variables.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/main/php_variables.c b/main/php_variables.c +index 1a40c2a1..cbdc7cf1 100644 +--- a/main/php_variables.c ++++ b/main/php_variables.c +@@ -514,7 +514,9 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) + } + + val = estrndup(val, val_len); +- php_url_decode(var, strlen(var)); ++ if (arg != PARSE_COOKIE) { ++ php_url_decode(var, strlen(var)); ++ } + if (sapi_module.input_filter(arg, var, &val, val_len, &new_val_len)) { + php_register_variable_safe(var, val, new_val_len, &array); + } +-- +2.25.1 + diff --git a/meta-oe/recipes-devtools/php/php_7.4.9.bb b/meta-oe/recipes-devtools/php/php_7.4.9.bb index fc01ea1953..73caed6543 100644 --- a/meta-oe/recipes-devtools/php/php_7.4.9.bb +++ b/meta-oe/recipes-devtools/php/php_7.4.9.bb @@ -30,6 +30,7 @@ SRC_URI_append_class-target = " \ file://phar-makefile.patch \ file://0001-opcache-config.m4-enable-opcache.patch \ file://xfail_two_bug_tests.patch \ + file://CVE-2020-7070.patch \ " S = "${WORKDIR}/php-${PV}" |