From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/, net-analyzer/tcpreplay/files/
Date: Sat, 18 Mar 2017 11:28:21 +0000 (UTC) [thread overview]
Message-ID: <1489836499.b4d13b3c9625fbb1308177dfbd192f399ab26c9d.jer@gentoo> (raw)
commit: b4d13b3c9625fbb1308177dfbd192f399ab26c9d
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 11:28:00 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 11:28:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4d13b3c
net-analyzer/tcpreplay: Add patch for CVE-2017-6429 (bug #612224).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../files/tcpreplay-4.1.2-CVE-2017-6429.patch | 27 ++++++++++++++++++++++
...play-4.1.2.ebuild => tcpreplay-4.1.2-r1.ebuild} | 3 ++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch
new file mode 100644
index 00000000000..42c74d65071
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch
@@ -0,0 +1,27 @@
+--- a/src/tcpcapinfo.c
++++ b/src/tcpcapinfo.c
+@@ -281,6 +281,15 @@ main(int argc, char *argv[])
+ caplen = pcap_ph.caplen;
+ }
+
++ if (caplentoobig) {
++ printf("\n\nCapture file appears to be damaged or corrupt.\n"
++ "Contains packet of size %u, bigger than snap length %u\n",
++ caplen, pcap_fh.snaplen);
++
++ close(fd);
++ break;
++ }
++
+ /* check to make sure timestamps don't go backwards */
+ if (last_sec > 0 && last_usec > 0) {
+ if ((pcap_ph.ts.tv_sec == last_sec) ?
+@@ -306,7 +315,7 @@ main(int argc, char *argv[])
+ }
+
+ close(fd);
+- continue;
++ break;
+ }
+
+ /* print the frame checksum */
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.2-r1.ebuild
similarity index 95%
rename from net-analyzer/tcpreplay/tcpreplay-4.1.2.ebuild
rename to net-analyzer/tcpreplay/tcpreplay-4.1.2-r1.ebuild
index a27f9136a0b..90d4ff01657 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.1.2.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -27,6 +27,7 @@ DOCS=(
)
PATCHES=(
"${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch
+ "${FILESDIR}"/${PN}-4.1.2-CVE-2017-6429.patch
)
src_prepare() {
next reply other threads:[~2017-03-18 11:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-18 11:28 Jeroen Roovers [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-01 13:36 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/, net-analyzer/tcpreplay/files/ Sam James
2022-11-24 8:40 Sam James
2018-12-31 17:40 Jeroen Roovers
2016-11-24 22:42 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1489836499.b4d13b3c9625fbb1308177dfbd192f399ab26c9d.jer@gentoo \
--to=jer@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox