summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-21 08:53:31 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-21 09:53:21 +0200
commit1089602c11d4fb24786c170a33fc23b758398669 (patch)
tree81edb8993f34b769843750f58578f193cf8cecdb
parentbdac5d6ebf3b47578bd94e6ae605ddddfb0a8c94 (diff)
downloadnet-1089602c11d4fb24786c170a33fc23b758398669.tar.gz
net-1089602c11d4fb24786c170a33fc23b758398669.tar.xz
apache: Fix CVE-2017-9798 (aka optionsbleed)
-rw-r--r--metadata/repository_mask.conf6
-rw-r--r--packages/www-servers/apache/apache-2.4.27-r1.exheres-0 (renamed from packages/www-servers/apache/apache-2.4.27.exheres-0)1
-rw-r--r--packages/www-servers/apache/files/apache-CVE-2017-9798-optionsbleed.patch19
3 files changed, 23 insertions, 3 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 261a7e0..2b9ff81 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -195,11 +195,11 @@ net-mail/dovecot[<2.2.29] [[
description = [ CVE-2017-2669 ]
]]
-www-servers/apache[<2.4.27] [[
+www-servers/apache[<2.4.27-r1] [[
author = [ Heiko Becker <heirecka@exherbo.org> ]
- date = [ 13 Jul 2017 ]
+ date = [ 21 Sep 2017 ]
token = security
- description = [ CVE-2017-{9788,9789} ]
+ description = [ CVE-2017-9798 ]
]]
dev-scm/libgit2[<0.24.6] [[
diff --git a/packages/www-servers/apache/apache-2.4.27.exheres-0 b/packages/www-servers/apache/apache-2.4.27-r1.exheres-0
index 98432f3..2cc1c9f 100644
--- a/packages/www-servers/apache/apache-2.4.27.exheres-0
+++ b/packages/www-servers/apache/apache-2.4.27-r1.exheres-0
@@ -42,5 +42,6 @@ DEPENDENCIES="
DEFAULT_SRC_PREPARE_PATCHES+=(
-p0 "${FILES}"/${PN}-libressl.patch
+ "${FILES}"/${PN}-CVE-2017-9798-optionsbleed.patch
)
diff --git a/packages/www-servers/apache/files/apache-CVE-2017-9798-optionsbleed.patch b/packages/www-servers/apache/files/apache-CVE-2017-9798-optionsbleed.patch
new file mode 100644
index 0000000..cc16045
--- /dev/null
+++ b/packages/www-servers/apache/files/apache-CVE-2017-9798-optionsbleed.patch
@@ -0,0 +1,19 @@
+Upstream: yes, https://svn.apache.org/viewvc?view=revision&revision=1807754
+ Backport from https://svn.apache.org/viewvc?view=revision&revision=1807655
+Reason: CVE-2017-9798
+
+--- server/core.c 2017/09/08 13:10:16 1807753
++++ server/core.c 2017/09/08 13:13:11 1807754
+@@ -2266,6 +2266,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));
+ }