diff --git a/CVE-2020-8037.patch b/CVE-2020-8037.patch new file mode 100644 index 0000000000000000000000000000000000000000..b321549cb1a4349c86bca0b6ada8ed31f22f267a --- /dev/null +++ b/CVE-2020-8037.patch @@ -0,0 +1,65 @@ +From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001 +From: Guy Harris +Date: Sat, 18 Apr 2020 14:04:59 -0700 +Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large +buffer. + +The buffer should be big enough to hold the captured data, but it +doesn't need to be big enough to hold the entire on-the-network packet, +if we haven't captured all of it. + +(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334) +--- + print-ppp.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/print-ppp.c b/print-ppp.c +index 891761728..33fb03412 100644 +--- a/print-ppp.c ++++ b/print-ppp.c +@@ -1367,19 +1367,29 @@ + return 0; + } + ++/* ++ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes. ++ * The length argument is the on-the-wire length, not the captured ++ * length; we can only un-escape the captured part. ++ */ + static void + ppp_hdlc(netdissect_options *ndo, + const u_char *p, int length) + { ++ u_int caplen = ndo->ndo_snapend - p; + u_char *b, *t, c; + const u_char *s; +- int i, proto; ++ u_int i; ++ int proto; + const void *se; + ++ if (caplen == 0) ++ return; ++ + if (length <= 0) + return; + +- b = (u_char *)malloc(length); ++ b = (u_char *)malloc(caplen); + if (b == NULL) + return; + +@@ -1388,10 +1398,10 @@ + * Do this so that we dont overwrite the original packet + * contents. + */ +- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) { ++ for (s = p, t = b, i = caplen; i != 0; i--) { + c = *s++; + if (c == 0x7d) { +- if (i <= 1 || !ND_TTEST(*s)) ++ if (i <= 1) + break; + i--; + c = *s++ ^ 0x20; + diff --git a/tcpdump.spec b/tcpdump.spec index 2b8e07aa605c227ea1d16960b4f22a30558554c4..7f6c3147fb26bf90b004ab24cc4d5fa6891c9392 100644 --- a/tcpdump.spec +++ b/tcpdump.spec @@ -1,7 +1,7 @@ Name: tcpdump Epoch: 14 Version: 4.9.3 -Release: 3 +Release: 4 Summary: A network traffic monitoring tool License: BSD with advertising URL: http://www.tcpdump.org @@ -10,15 +10,16 @@ Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz Source2: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz.sig -Patch0002: 0002-Use-getnameinfo-instead-of-gethostbyaddr.patch -Patch0003: 0003-Drop-root-priviledges-before-opening-first-savefile-.patch -Patch0004: 0004-tcpslice-update-tcpslice-patch-to-1.2a3.patch -Patch0005: 0005-tcpslice-remove-unneeded-include.patch -Patch0006: 0006-tcpslice-don-t-test-the-pointer-but-pointee-for-NULL.patch -Patch0007: 0007-Introduce-nn-option.patch -Patch0009: 0009-Change-n-flag-to-nn-in-TESTonce.patch -Patch0011: 0011-Evp-cipher-buffers.patch -Patch0012: 0012-Add-printing-support-for-vsockmon-devices.patch +Patch0: 0002-Use-getnameinfo-instead-of-gethostbyaddr.patch +Patch1: 0003-Drop-root-priviledges-before-opening-first-savefile-.patch +Patch2: 0004-tcpslice-update-tcpslice-patch-to-1.2a3.patch +Patch3: 0005-tcpslice-remove-unneeded-include.patch +Patch4: 0006-tcpslice-don-t-test-the-pointer-but-pointee-for-NULL.patch +Patch5: 0007-Introduce-nn-option.patch +Patch6: 0009-Change-n-flag-to-nn-in-TESTonce.patch +Patch7: 0011-Evp-cipher-buffers.patch +Patch8: 0012-Add-printing-support-for-vsockmon-devices.patch +Patch9: CVE-2020-8037.patch Requires(pre): shadow-utils BuildRequires: automake openssl-devel libpcap-devel git-core gcc @@ -89,6 +90,12 @@ exit 0 %{_mandir}/man8/tcpdump.8* %changelog +* Fri Dec 18 2020 seuzw <930zhaowei@163.com> - 4.9.3-4 +- Type:CVE +- ID:CVE-2020-8037 +- SUG:NA +- DESC:fix CVE-2020-8037 + * Tue Dec 31 2019 openEuler Buildteam - 4.9.3-3 - Type:bugfix - ID:NA