Merge branch 'debian'

[hcoop/debian/exim4.git] / debian / patches / 84_17-Security-Always-exit-when-LOG_PANIC_DIE-is-set.patch

diff --git a/debian/patches/84_17-Security-Always-exit-when-LOG_PANIC_DIE-is-set.patch b/debian/patches/84_17-Security-Always-exit-when-LOG_PANIC_DIE-is-set.patch
new file mode 100644 (file)
index 0000000..a9eee56
--- /dev/null
+++ b/debian/patches/84_17-Security-Always-exit-when-LOG_PANIC_DIE-is-set.patch
@@ -0,0 +1,24 @@
+From 9b1ba71e66d18b1ae185e4d83788dc913f903a56 Mon Sep 17 00:00:00 2001
+From: Qualys Security Advisory <qsa@qualys.com>
+Date: Sun, 21 Feb 2021 22:09:06 -0800
+Subject: [PATCH 17/29] Security: Always exit when LOG_PANIC_DIE is set
+
+---
+ src/log.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/log.c b/src/log.c
+index d08200044..c8313890e 100644
+--- a/src/log.c
++++ b/src/log.c
+@@ -894,6 +894,7 @@ if (!(flags & (LOG_MAIN|LOG_PANIC|LOG_REJECT)))
+ if (f.disable_logging)
+   {
+   DEBUG(D_any) debug_printf("log writing disabled\n");
++  if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE, NULL);
+   return;
+   }
+ 
+-- 
+2.30.2
+