main/hylafax: security fix (CVE-2018-17141)

Fixes #9457

2 files changed, 142 insertions, 2 deletions

diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD
index fd973d3540..4dc9b1c80c 100644
--- a/main/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Sends and receives faxes"
 url="http://www.hylafax.org/"
 arch="all"
@@ -16,9 +16,14 @@ source="ftp://ftp.hylafax.org/source/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	hylafax-charset.patch
+	CVE-2018-17141.patch
 	"
 builddir="$srcdir"/$pkgname-$pkgver
 
+# secfixes
+#   6.0.6-r5:
+#     - CVE-2018-17141
+
 prepare() {
 	default_prepare
 	update_config_guess
@@ -94,4 +99,5 @@ package(){
 sha512sums="be7e0533a24391c87deac6af35e01c81a79c99977c7f7a931e336d7c737b388d2a7c147faab3bf5eda196b1fa1c8671bee53c05dab2338f2f519010532f7d773  hylafax-6.0.6.tar.gz
 3862cefcd26092000e4489c097537e5e0e2ae1f7c2a7a16b1e933b3bb78d136b6d8a65fb712ae245dd8ca881900408d0d9788bd2e0b859a9569fc6f4ede8cc7c  hylafax.initd
 3c07726cc9d7351dceb80a46354c6626e54b033b0f434c1db01db2a3b3ab5e9084d551dd23cae3ab40806f27aa5fa0a5b70c43a6b7802356871c0b343baa2376  hylafax.confd
-f97c805a62dfcb57f85f614b6eb28bd6b58e0582ce4f9aa5166337a46d453ea038a098223d879d120f51454008a5e8ed2fa60ba6e8be12af7b7d5a4927c51471  hylafax-charset.patch"
+f97c805a62dfcb57f85f614b6eb28bd6b58e0582ce4f9aa5166337a46d453ea038a098223d879d120f51454008a5e8ed2fa60ba6e8be12af7b7d5a4927c51471  hylafax-charset.patch
+062628b296c32692c7853c1c2395e27e1d9d7ff2136d486c4ba69b7ff3aedaef60ac50ac0a2a2581373a163109ba84c1b73f96cdd154d224b96b21d50e74f25c  CVE-2018-17141.patch"
diff --git a/main/hylafax/CVE-2018-17141.patch b/main/hylafax/CVE-2018-17141.patch
new file mode 100644
index 0000000000..a4ebd446ed
--- /dev/null
+++ b/main/hylafax/CVE-2018-17141.patch
@@ -0,0 +1,134 @@
+From: Patrice Fournier <patrice.fournier@ifax.com>
+Date: Tue, 18 Sep 2018 03:00:53 +0000 (-0400)
+Subject: Address CVE-2018-17141 and fixes a few vulnerabilities in code supporting JPEG
+X-Git-Tag: HYLAFAX-6_0_7~1
+X-Git-Url: http://git.hylafax.org/HylaFAX?a=commitdiff_plain;h=82fa7bdbffc253de4d3e80a87d47fdbf68eabe36;hp=5b95b384dd1b44b9d2c5c15cc10e50def7c1555d
+
+Address CVE-2018-17141 and fixes a few vulnerabilities in code supporting JPEG
+
+These changes are adapted from Lee's fix for this vulnerability.
+
+Luis Merino, Markus Vervier, and Eric Sesterhenn of X41 D-SEC GmbH
+(Security Advisory: X41-2018-008) discovered an uninitialized pointer write
+and also an out-of-bounds write in FaxModem::writeECMData() that could lead
+to remote code execution with a specially-crafted fax sender.
+
+These changes fix the coding errors and deliberately prevent malicious and
+malfunctioning senders from inadvertently or deliberately setting JPEG and
+MH/MR/MMR/JBIG formats in the same DCS signal.
+---
+
+diff --git a/faxd/Class2.c++ b/faxd/Class2.c++
+index 9bd312d..6439719 100644
+--- a/faxd/Class2.c++
++++ b/faxd/Class2.c++
+@@ -485,6 +485,15 @@ Class2Modem::parseClass2Capabilities(const char* cap, Class2Params& params, bool
+ 	} else {
+ 	    if (jpscan == 0x1) params.jp = JP_GREY;
+ 	    else if (jpscan & 0x2) params.jp = JP_COLOR;
++	    /*
++	     * ITU T.30 does not specify that bits 16 (MR) or 31 (MMR) must be set to zero if color fax is used;
++	     * and ITU T.32 Table 21 provides a data field, "JP", for JPEG support separate from "DF" for data
++	     * format and does not specify that DF is meaningless in DCS when JP is used; but because T.4/T.6
++	     * (MH/MR/MMR), JBIG, and JPEG are distinct formats from each other, we must conclude that any
++	     * indication of JPEG in DCS must, therefore, invalidate any indication in DCS of MH/MR/MMR/JBIG.
++	     * Otherwise, having both df and jp be non-zero will be confusing and possibly cause problems.
++	     */
++	    if (params.jp != JP_NONE) params.df = 0;	// Yes, this is DF_1DMH, but there is no "DF_NONE".
+ 	}
+ 	return (true);
+     } else {
+diff --git a/faxd/CopyQuality.c++ b/faxd/CopyQuality.c++
+index 6ebc936..d1f2d0f 100644
+--- a/faxd/CopyQuality.c++
++++ b/faxd/CopyQuality.c++
+@@ -38,6 +38,7 @@
+ #include <ctype.h>
+ 
+ #define	RCVBUFSIZ	(32*1024)		// XXX
++#define	COLORBUFSIZ	(2000*1024)		// 1MB is not big enough
+ 
+ static	void setupCompression(TIFF*, u_int, u_int, uint32);
+ 
+@@ -356,7 +357,7 @@ FaxModem::recvPageDLEData(TIFF* tif, bool checkQuality,
+ 		 * rather fax-specific.
+ 		 */
+ 		recvEOLCount = 0;
+-		recvRow = (u_char*) malloc(1024*1000);    // 1M should do it?
++		recvRow = (u_char*) malloc(COLORBUFSIZ);
+ 		fxAssert(recvRow != NULL, "page buffering error (JPEG page).");
+ 		recvPageStart = recvRow;
+ 	    }
+@@ -408,8 +409,12 @@ FaxModem::recvPageDLEData(TIFF* tif, bool checkQuality,
+ 		    if (params.df == DF_JBIG) {
+ 			flushRawData(tif, 0, (const u_char*) buf, cc);
+ 		    } else {
+-			memcpy(recvRow, (const char*) buf, cc);
+-			recvRow += cc;
++			/* We don't support reception of a JPEG page bigger than COLORBUFSIZ. */
++			if (recvRow + cc - recvPageStart > COLORBUFSIZ) cc = recvPageStart + COLORBUFSIZ - recvRow;
++			if (cc > 0) {
++			    memcpy(recvRow, (const char*) buf, cc);
++			    recvRow += cc;
++			}
+ 		    }
+ 		} while (!fin);
+ 		if (params.df == DF_JBIG) clearSDNORMCount();
+@@ -987,7 +992,7 @@ FaxModem::writeECMData(TIFF* tif, u_char* buf, u_int cc, const Class2Params& par
+ 	    case JP_GREY+4:
+ 	    case JP_COLOR+4:
+ 		recvEOLCount = 0;
+-		recvRow = (u_char*) malloc(1024*1000);    // 1M should do it?
++		recvRow = (u_char*) malloc(COLORBUFSIZ);
+ 		fxAssert(recvRow != NULL, "page buffering error (JPEG page).");
+ 		recvPageStart = recvRow;
+ 		setupStartPage(tif, params);
+@@ -1039,14 +1044,20 @@ FaxModem::writeECMData(TIFF* tif, u_char* buf, u_int cc, const Class2Params& par
+ 	    }
+ 	    break;
+     }
+-    if (params.jp != JP_GREY && params.jp != JP_COLOR) {
+-	flushRawData(tif, 0, (const u_char*) buf, cc);
+-    } else {
+-	memcpy(recvRow, (const char*) buf, cc);
+-	recvRow += cc;
+-    }
+-    if (seq & 2 && (params.jp == JP_GREY || params.jp == JP_COLOR)) {
+-	fixupJPEG(tif);
++    switch (dataform) {
++       case JP_GREY+4:
++       case JP_COLOR+4:
++           /* We don't support reception of a JPEG page bigger than COLORBUFSIZ. */
++           if (recvRow + cc - recvPageStart > COLORBUFSIZ) cc = recvPageStart + COLORBUFSIZ - recvRow;
++           if (cc > 0) {
++               memcpy(recvRow, (const char*) buf, cc);
++               recvRow += cc;
++           }
++           if (seq & 2) fixupJPEG(tif);
++           break;
++       default:
++           flushRawData(tif, 0, (const u_char*) buf, cc);
++           break;
+     }
+ }
+ 
+diff --git a/libhylafax/Class2Params.c++ b/libhylafax/Class2Params.c++
+index 0409cbd..81b9a22 100644
+--- a/libhylafax/Class2Params.c++
++++ b/libhylafax/Class2Params.c++
+@@ -303,6 +303,15 @@ Class2Params::setFromDCS(FaxParams& dcs_caps)
+     if (dcs_caps.isBitEnabled(FaxParams::BITNUM_FULLCOLOR)) {
+ 	if (jp == JP_GREY) jp = JP_COLOR;
+     }
++    /*
++     * ITU T.30 does not specify that bits 16 (MR) or 31 (MMR) must be set to zero if color fax is used;
++     * and ITU T.32 Table 21 provides a data field, "JP", for JPEG support separate from "DF" for data
++     * format and does not specify that DF is meaningless in DCS when JP is used; but because T.4/T.6
++     * (MH/MR/MMR), JBIG, and JPEG are distinct formats from each other, we must conclude that any
++     * indication of JPEG in DCS must, therefore, invalidate any indication in DCS of MH/MR/MMR/JBIG.
++     * Otherwise, having both df and jp be non-zero will be confusing and possibly cause problems.
++     */
++    if (jp != JP_NONE) df = 0;	// Yes, this is DF_1DMH, but there is no "DF_NONE".
+     if (ec == EC_DISABLE &&
+ 	(df == DF_2DMMR || df == DF_JBIG || jp == JP_GREY || jp == JP_COLOR)) {
+ 	// MMR, JBIG, and JPEG require ECM... we've seen cases where fax