apache2: Import patch for CVE-2017-9798 ("optionsbleed")

Imported from:
https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch

For details see:
https://nvd.nist.gov/vuln/detail/CVE-2017-9798

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>

diff --git a/lfs/apache2 b/lfs/apache2
index e434d1b244203ce8b920a26e2100d7bb972f6681..b7a741614c8f47a798ea162bc04b7b2ddc2ae99d 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/apache-2.4.27-PR61382-fix.patch
-
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/apache-2.4.27-CVE-2017-9798-fix.patch
        ### Add IPFire's layout, too
        echo "# IPFire layout" >> $(DIR_APP)/config.layout
        echo "<Layout IPFire>" >> $(DIR_APP)/config.layout

diff --git a/src/patches/apache-2.4.27-CVE-2017-9798-fix.patch b/src/patches/apache-2.4.27-CVE-2017-9798-fix.patch
new file mode 100644 (file)
index 0000000..eb82c8b
--- /dev/null
+++ b/src/patches/apache-2.4.27-CVE-2017-9798-fix.patch
@@ -0,0 +1,15 @@
+--- server/core.c      2017/08/16 16:50:29     1805223
++++ server/core.c      2017/09/08 13:13:11     1807754
+@@ -2262,6 +2262,12 @@
+             /* method has not been registered yet, but resource restriction
+              * is always checked before method handling, so register it.
+              */
++            if (cmd->pool == cmd->temp_pool) {
++                /* In .htaccess, we can't globally register new methods. */
++                return apr_psprintf(cmd->pool, "Could not register method '%s' "
++                                   "for %s from .htaccess configuration",
++                                    method, cmd->cmd->name);
++            }
+             methnum = ap_method_register(cmd->pool,
+                                          apr_pstrdup(cmd->pool, method));
+         }