From 6f97d821f13060b234c3d272d7672558bb2365ae Mon Sep 17 00:00:00 2001 From: Qualys Security Advisory Date: Sun, 21 Feb 2021 22:09:06 -0800 Subject: [PATCH] SECURITY: Always exit when LOG_PANIC_DIE is set (cherry picked from commit e20aa895b37f449d5c81c3e7b102fc534b5d23ba) (cherry picked from commit 3b8c0ceb7339329188e19efb907da950dbe691d1) --- doc/doc-txt/ChangeLog | 4 ++++ src/src/log.c | 1 + 2 files changed, 5 insertions(+) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index bcace272d..a5bce7e81 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -306,6 +306,10 @@ QS/03 When reading the output from interpreted forward files we do not pass the pipe between the parent and the interpreting process to executed child processes (if any). +QS/04 Always die if requested from internal logging, even is logging is + disabled. + + Exim version 4.94 ----------------- diff --git a/src/src/log.c b/src/src/log.c index 2cf578069..6e35ff9a7 100644 --- a/src/src/log.c +++ b/src/src/log.c @@ -903,6 +903,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); return; } -- 2.30.2