File apache2-CVE-2020-11984.patch of Package apache2

Overview Repositories Revisions Requests Users Attributes Meta

File apache2-CVE-2020-11984.patch of Package apache2

--- 2.4.x/modules/proxy/mod_proxy_uwsgi.c	2020/07/24 09:31:46	1880250
+++ 2.4.x/modules/proxy/mod_proxy_uwsgi.c	2020/07/24 09:35:25	1880251
@@ -136,7 +136,7 @@
     int j;
 
     apr_size_t headerlen = 4;
-    apr_uint16_t pktsize, keylen, vallen;
+    apr_size_t pktsize, keylen, vallen;
     const char *script_name;
     const char *path_info;
     const char *auth;
@@ -178,6 +178,15 @@
         headerlen += 2 + strlen(env[j].key) + 2 + strlen(env[j].val);
     }
 
+    pktsize = headerlen - 4;
+    if (pktsize > APR_UINT16_MAX) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10259)
+                      "can't send headers to %s:%u: packet size too "
+                      "large (%" APR_SIZE_T_FMT ")",
+                      conn->hostname, conn->port, pktsize);
+        return HTTP_INTERNAL_SERVER_ERROR;
+    }
+
     ptr = buf = apr_palloc(r->pool, headerlen);
 
     ptr += 4;
@@ -196,8 +205,6 @@
         ptr += vallen;
     }
 
-    pktsize = headerlen - 4;
-
     buf[0] = 0;
     buf[1] = (apr_byte_t) (pktsize & 0xff);
     buf[2] = (apr_byte_t) ((pktsize >> 8) & 0xff);

Places

File apache2-CVE-2020-11984.patch of Package apache2

Places