[apache2] 03/04: Avoid segfault in mpm_event if a signal is received too soon

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit 2b3d49f5e9d11c5fc248d7820b3460ec8c7bfb96
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Jan 14 19:26:22 2017 +0100

    Avoid segfault in mpm_event if a signal is received too soon
---
 debian/changelog                                   |  2 ++
 .../mpm_event_restart_segfault_PR60487.patch       | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9e25609..3eb423b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ apache2 (2.4.25-2) UNRELEASED; urgency=medium
   * When running on systems with systemd, make 'apache2ctl start' invoke
     systemctl instead. Otherwise systemd will think apache2 is not running
     and ignore further commands like reload. Closes: #839227
+  * Avoid segfault in mpm_event if a signal is received too soon after start.
+    PR 60487
   * Add test for some modules to be enabled.
   * Remove mention of CVE-2016-5387 in 2.4.25-1 changelog. It was already
     fixed in 2.4.23-2.
diff --git a/debian/patches/mpm_event_restart_segfault_PR60487.patch b/debian/patches/mpm_event_restart_segfault_PR60487.patch
new file mode 100644
index 0000000..bc2825f
--- /dev/null
+++ b/debian/patches/mpm_event_restart_segfault_PR60487.patch
@@ -0,0 +1,23 @@
+# https://bz.apache.org/bugzilla/show_bug.cgi?id=60487
+--- apache2.orig/server/mpm/event/event.c
++++ apache2/server/mpm/event/event.c
+@@ -681,7 +681,8 @@ static void ap_start_shutdown(int gracef
+         return;
+     }
+     shutdown_pending = 1;
+-    retained->is_graceful = graceful;
++    if (retained)
++        retained->is_graceful = graceful;
+ }
+ 
+ /* do a graceful restart if graceful == 1 */
+@@ -693,7 +694,8 @@ static void ap_start_restart(int gracefu
+         return;
+     }
+     restart_pending = 1;
+-    retained->is_graceful = graceful;
++    if (retained)
++        retained->is_graceful = graceful;
+ }
+ 
+ static void sig_term(int sig)
diff --git a/debian/patches/series b/debian/patches/series
index 4a1b914..ff1313a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ reproducible_builds.diff
 #suexec-custom.patch
 
 fix_logresolve_segfault.patch
+mpm_event_restart_segfault_PR60487.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git