summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd/apache2/apache2/CVE-2021-26690.patch
diff options
context:
space:
mode:
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.patch39
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 d3aea9e12..000000000
--- a/meta-webserver/recipes-httpd/apache2/apache2/CVE-2021-26690.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 67bd9bfe6c38831e14fe7122f1d84391472498f8 Mon Sep 17 00:00:00 2001
2From: Yann Ylavic <ylavic@apache.org>
3Date: Mon, 1 Mar 2021 20:07:08 +0000
4Subject: [PATCH] mod_session: save one apr_strtok() in
5 session_identity_decode().
6
7When the encoding is invalid (missing '='), no need to parse further.
8
9git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1887050 13f79535-47bb-0310-9956-ffa450edef68
10
11Upstream-Status: Backport
12CVE: CVE-2021-26690
13
14Reference to upstream patch:
15https://security-tracker.debian.org/tracker/CVE-2021-26690
16https://github.com/apache/httpd/commit/67bd9bfe6c38831e14fe7122f1d84391472498f8
17
18Signed-off-by: Li Wang <li.wang@windriver.com>
19---
20 modules/session/mod_session.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/modules/session/mod_session.c b/modules/session/mod_session.c
24index ebd05b0..af70f6b 100644
25--- a/modules/session/mod_session.c
26+++ b/modules/session/mod_session.c
27@@ -404,8 +404,8 @@ static apr_status_t session_identity_decode(request_rec * r, session_rec * z)
28 char *plast = NULL;
29 const char *psep = "=";
30 char *key = apr_strtok(pair, psep, &plast);
31- char *val = apr_strtok(NULL, psep, &plast);
32 if (key && *key) {
33+ char *val = apr_strtok(NULL, sep, &plast);
34 if (!val || !*val) {
35 apr_table_unset(z->entries, key);
36 }
37--
382.7.4
39