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:22:44 -0700 |
| commit | 4b28324739d949e1d65c278fbab873d590f233f4 (patch) | |
| tree | 42d7b638a672d0425e89d19bb490a40cc8beae24 /meta-webserver/recipes-httpd/apache2/apache2/CVE-2020-35452.patch | |
| parent | 5741b949a875b07335d4920aefa6defd13ed45c6 (diff) | |
| download | meta-openembedded-contrib-4b28324739d949e1d65c278fbab873d590f233f4.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-2020-35452.patch')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/CVE-2020-35452.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/CVE-2020-35452.patch b/meta-webserver/recipes-httpd/apache2/apache2/CVE-2020-35452.patch deleted file mode 100644 index 001ca9252d..0000000000 --- a/meta-webserver/recipes-httpd/apache2/apache2/CVE-2020-35452.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3b6431eb9c9dba603385f70a2131ab4a01bf0d3b Mon Sep 17 00:00:00 2001 -From: Yann Ylavic <ylavic@apache.org> -Date: Mon, 18 Jan 2021 17:39:12 +0000 -Subject: [PATCH] Merge r1885659 from trunk: - -mod_auth_digest: Fast validation of the nonce's base64 to fail early if - the format can't match anyway. - -Submitted by: ylavic -Reviewed by: ylavic, covener, jailletc36 - -git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1885666 13f79535-47bb-0310-9956-ffa450edef68 - -Upstream-Status: Backport -CVE: CVE-2020-35452 - -Reference to upstream patch: -https://security-tracker.debian.org/tracker/CVE-2020-35452 -https://github.com/apache/httpd/commit/3b6431eb9c9dba603385f70a2131ab4a01bf0d3b - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - modules/aaa/mod_auth_digest.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c -index b760941..0825b1b 100644 ---- a/modules/aaa/mod_auth_digest.c -+++ b/modules/aaa/mod_auth_digest.c -@@ -1422,9 +1422,14 @@ static int check_nonce(request_rec *r, digest_header_rec *resp, - time_rec nonce_time; - char tmp, hash[NONCE_HASH_LEN+1]; - -- if (strlen(resp->nonce) != NONCE_LEN) { -+ /* Since the time part of the nonce is a base64 encoding of an -+ * apr_time_t (8 bytes), it should end with a '=', fail early otherwise. -+ */ -+ if (strlen(resp->nonce) != NONCE_LEN -+ || resp->nonce[NONCE_TIME_LEN - 1] != '=') { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01775) -- "invalid nonce %s received - length is not %d", -+ "invalid nonce '%s' received - length is not %d " -+ "or time encoding is incorrect", - resp->nonce, NONCE_LEN); - note_digest_auth_failure(r, conf, resp, 1); - return HTTP_UNAUTHORIZED; --- -2.7.4 - |