From: Wietse Venema <wietse@porcupine.org>
Date: Thu, 12 Mar 2020 05:00:00 +0000 (-0500)
Subject: postfix-3.2.13
X-Git-Tag: v3.2.13^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05a47db2a02e9bb5394e0614d6f8a75af7f92782;p=thirdparty%2Fpostfix.git

postfix-3.2.13
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 7e2b78536..399f87622 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23259,3 +23259,9 @@ Apologies for any names omitted.
 	had been negotiated. Problem reported by David Bürgin.
 	Files: milter/milter.h, milter/milter.c, milter/milter8.c
 
+20200312
+
+	Bugfix (introduced: Postfix 2.3): panic with Postfix
+	multi-Milter configuration during MAIL FROM. Milter client
+	state was not properly reset after one of the Milters failed.
+	Reported by WeiYu Wu.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 2ba7a48b5..199d457aa 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20200203"
-#define MAIL_VERSION_NUMBER	"3.2.12"
+#define MAIL_RELEASE_DATE	"20200312"
+#define MAIL_VERSION_NUMBER	"3.2.13"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index 6e42ca390..ce16923c8 100644
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -2566,6 +2566,7 @@ static int mail_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
     }
     if (state->milters != 0
 	&& (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
+	state->flags |= SMTPD_FLAG_NEED_MILTER_ABORT;
 	PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
 	err = milter_mail_event(state->milters,
 				milter_argv(state, argc - 2, argv + 2));
@@ -2681,11 +2682,14 @@ static void mail_reset(SMTPD_STATE *state)
 	state->queue_id = 0;
     }
     if (state->sender) {
-	if (state->milters != 0)
-	    milter_abort(state->milters);
 	myfree(state->sender);
 	state->sender = 0;
     }
+    /* WeiYu Wu: need to undo milter_mail_event() state change. */
+    if (state->flags & SMTPD_FLAG_NEED_MILTER_ABORT) {
+	milter_abort(state->milters);
+	state->flags &= ~SMTPD_FLAG_NEED_MILTER_ABORT;
+    }
     if (state->verp_delims) {
 	myfree(state->verp_delims);
 	state->verp_delims = 0;
diff --git a/postfix/src/smtpd/smtpd.h b/postfix/src/smtpd/smtpd.h
index 4facfb080..b64376786 100644
--- a/postfix/src/smtpd/smtpd.h
+++ b/postfix/src/smtpd/smtpd.h
@@ -195,6 +195,7 @@ typedef struct {
 #define SMTPD_FLAG_ILL_PIPELINING  (1<<1)	/* inappropriate pipelining */
 #define SMTPD_FLAG_AUTH_USED	   (1<<2)	/* don't reuse SASL state */
 #define SMTPD_FLAG_SMTPUTF8	   (1<<3)	/* RFC 6531/2 transaction */
+#define SMTPD_FLAG_NEED_MILTER_ABORT (1<<4)	/* undo milter_mail_event() */
 
  /* Security: don't reset SMTPD_FLAG_AUTH_USED. */
 #define SMTPD_MASK_MAIL_KEEP \