diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2021-08-02 10:09:22 +0800 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2021-09-02 18:24:53 -0700 |
| commit | ca550956aa919fb7f76c21c88676102902fbeec5 (patch) | |
| tree | 57574b881fc9aabd58bd02f8710e7ce3b8d1b288 /meta-webserver/recipes-httpd/apache2/apache2/CVE-2021-26690.patch | |
| parent | b9fe34b1ad280d1ae7f8bc684715d2d1529c60fa (diff) | |
| download | meta-openembedded-contrib-ca550956aa919fb7f76c21c88676102902fbeec5.tar.gz | |
apache2: upgrade 2.4.46 -> 2.4.48
Source: https://git.openembedded.org/meta-openembedded
https://git.openembedded.org/meta-openembedded
MR: 112869, 112835, 105131, 112702, 112829
Type: Security Fix
Disposition: Backport from https://git.openembedded.org/meta-openembedded/commit/meta-webserver/recipes-httpd/apache2?id=ba016d73b5233a43ec6e398b45445d13ddaad745
ChangeID: f3ac0bc1005c94a694573b823c8f3f7d4a15360c
Description:
Apache2 2.4.x is an LTS version with bug and CVE fixes.
https://downloads.apache.org/httpd/CHANGES_2.4.48
Includes these CVE fixes:
2.4.48
CVE-2021-31618
2.4.47
CVE-2020-13938
CVE-2020-11985
CVE-2021-33193
CVE-2019-17567
Drop these patches included in update:
CVE-2020-13950.patch
CVE-2020-35452.patch
CVE-2021-26690.patch
CVE-2021-26691.patch
CVE-2021-30641.patch
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit ba016d73b5233a43ec6e398b45445d13ddaad745)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2/CVE-2021-26690.patch')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/CVE-2021-26690.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/CVE-2021-26690.patch b/meta-webserver/recipes-httpd/apache2/apache2/CVE-2021-26690.patch deleted file mode 100644 index d3aea9e122..0000000000 --- a/meta-webserver/recipes-httpd/apache2/apache2/CVE-2021-26690.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 67bd9bfe6c38831e14fe7122f1d84391472498f8 Mon Sep 17 00:00:00 2001 -From: Yann Ylavic <ylavic@apache.org> -Date: Mon, 1 Mar 2021 20:07:08 +0000 -Subject: [PATCH] mod_session: save one apr_strtok() in - session_identity_decode(). - -When the encoding is invalid (missing '='), no need to parse further. - -git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1887050 13f79535-47bb-0310-9956-ffa450edef68 - -Upstream-Status: Backport -CVE: CVE-2021-26690 - -Reference to upstream patch: -https://security-tracker.debian.org/tracker/CVE-2021-26690 -https://github.com/apache/httpd/commit/67bd9bfe6c38831e14fe7122f1d84391472498f8 - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - modules/session/mod_session.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/session/mod_session.c b/modules/session/mod_session.c -index ebd05b0..af70f6b 100644 ---- a/modules/session/mod_session.c -+++ b/modules/session/mod_session.c -@@ -404,8 +404,8 @@ static apr_status_t session_identity_decode(request_rec * r, session_rec * z) - char *plast = NULL; - const char *psep = "="; - char *key = apr_strtok(pair, psep, &plast); -- char *val = apr_strtok(NULL, psep, &plast); - if (key && *key) { -+ char *val = apr_strtok(NULL, sep, &plast); - if (!val || !*val) { - apr_table_unset(z->entries, key); - } --- -2.7.4 - |