Skip to contentSkip to conversation

package/tcpreplay: security bump to version 4.3.2

PATCH New Fabrice Fontaine 3 participants 7 messages Aug 13, 2019 – Sep 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/tcpreplay: security bump to version 4.3.2

This release contains bug fixes only:

- CVE-2019-8381 memory access in do_checksum() (#538)
- CVE-2019-8376 NULL pointer dereference get_layer4_v6() (#537)
- CVE-2019-8377 NULL pointer dereference get_ipv6_l4proto() (#536)
- Rename Ethereal to Wireshark (#545)

---
 package/tcpreplay/tcpreplay.hash | 4 ++--
 package/tcpreplay/tcpreplay.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
package/tcpreplay/tcpreplay.hash +2 -2
index 31b3d3eb28..cc00bc09b1 100644
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://github.com/appneta/tcpreplay/releases/download/v4.3.1/tcpreplay-4.3.1.tar.xz.asc
+# https://github.com/appneta/tcpreplay/releases/download/v4.3.2/tcpreplay-4.3.2.tar.xz.asc
 # using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E
-sha256 108924a25e616e3465139410c49cae629c338df73443dfc8fc155ea9f099c659  tcpreplay-4.3.1.tar.xz
+sha256 955aed6a40f49a5b8c1234fd0a928edc5c665d94b7755ab5769c30938e33f380  tcpreplay-4.3.2.tar.xz
 sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05  docs/LICENSE
package/tcpreplay/tcpreplay.mk +2 -2
index 71e57d5bd9..5a62091f82 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-TCPREPLAY_VERSION = 4.3.1
+TCPREPLAY_VERSION = 4.3.2
 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)
-TCPREPLAY_SOURCE = tcpreplay-4.3.1.tar.xz
+TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz
 TCPREPLAY_LICENSE = GPL-3.0
 TCPREPLAY_LICENSE_FILES = docs/LICENSE
 TCPREPLAY_CONF_ENV = \
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/3 package/libdnet: fix dnet-config

Add dnet-config to LIBDNET_CONFIG_SCRIPTS so this script can be used by applications such as tcpreplay

---
 package/libdnet/libdnet.mk | 1 +
 1 file changed, 1 insertion(+)
package/libdnet/libdnet.mk +1 -0
index 00d9c4fd40..d1cc0bf150 100644
@@ -13,6 +13,7 @@ LIBDNET_AUTORECONF = YES
 LIBDNET_CONF_OPTS = \
 	--with-gnu-ld \
 	--with-check=no
+LIBDNET_CONFIG_SCRIPTS = dnet-config
 
 ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
 LIBDNET_DEPENDENCIES = python
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/3 package/libdnet: fix dnet-config

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Add dnet-config to LIBDNET_CONFIG_SCRIPTS so this script can be used by applications such as tcpreplay

Committed to 2019.02.x and 2019.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 3/3 package/tcpreplay: add optional libdnet dependency

In reply to Fabrice Fontaine

Fixes:
- https://bugs.buildroot.org/show_bug.cgi?id=12096

---
 ...001-configure-ac-fix-without-libdnet.patch | 76 +++++++++++++++++++
 package/tcpreplay/tcpreplay.mk                |  9 +++
 2 files changed, 85 insertions(+)
 create mode 100644 package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch
package/tcpreplay/0001-configure-ac-fix-without-libdnet.patch new file +76 -0
new file mode 100644
index 0000000000..75ed4f94de
@@ -0,0 +1,76 @@
+From acee9c0c46f71f1f4c33c2dadf69d19e24b90f27 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Tue, 13 Aug 2019 20:19:23 +0200
+Subject: [PATCH] configure.ac: fix --without-libdnet
+
+Allow the user to disable libdnet check through --without-libdnet.
+This option is useful to cross-compile tcpreplay to avoid build failures
+if libdnet is installed on host but not on target, see
+https://bugs.buildroot.org/show_bug.cgi?id=12096
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status: https://github.com/appneta/tcpreplay/pull/567]
+---
+ configure.ac | 48 +++++++++++++++++++++++++-----------------------
+ 1 file changed, 25 insertions(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 39ba58b7..5de3dcb5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1464,30 +1464,32 @@ if test $have_cygwin = no ; then
+         AC_HELP_STRING([--with-libdnet=DIR], [Use libdnet in DIR]),
+         [trydnetdir=$withval])
+ 
+-    case "$build_os" in
+-    linux*)
+-        dnl # Debian/Ubuntu already have a package called libdnet
+-        dnl # so you the package you want to install libdumbnet-dev
+-        for testdir in $trydnetdir /usr/local /opt/local /usr ; do
+-            if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then
+-                LDNETINC="$($testdir/bin/dumbnet-config --cflags)"
+-                LDNETLIB="$($testdir/bin/dumbnet-config --libs)"
+-                libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)"
+-                founddnet=$testdir
+-            fi
+-        done
+-        ;;
+-    esac
++    if test $trydnetdir != no; then
++        case "$build_os" in
++        linux*)
++            dnl # Debian/Ubuntu already have a package called libdnet
++            dnl # so you the package you want to install libdumbnet-dev
++            for testdir in $trydnetdir /usr/local /opt/local /usr ; do
++                if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then
++                    LDNETINC="$($testdir/bin/dumbnet-config --cflags)"
++                    LDNETLIB="$($testdir/bin/dumbnet-config --libs)"
++                    libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)"
++                    founddnet=$testdir
++                fi
++            done
++            ;;
++        esac
+ 
+-    if test $founddnet = no ; then
+-        for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do
+-            if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then
+-                LDNETINC="$($testdir/bin/dnet-config --cflags)"
+-                LDNETLIB="$($testdir/bin/dnet-config --libs)"
+-                libdnet_version="$($testdir/bin/dnet-config --version)"
+-                founddnet=$testdir
+-            fi
+-        done
++        if test $founddnet = no ; then
++            for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do
++                if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then
++                    LDNETINC="$($testdir/bin/dnet-config --cflags)"
++                    LDNETLIB="$($testdir/bin/dnet-config --libs)"
++                    libdnet_version="$($testdir/bin/dnet-config --version)"
++                    founddnet=$testdir
++                fi
++            done
++        fi
+     fi
+ 
+     if test $founddnet = no ; then
package/tcpreplay/tcpreplay.mk +9 -0
index 5a62091f82..39d0f44343 100644
@@ -14,12 +14,21 @@ TCPREPLAY_CONF_ENV = \
 TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr \
 	--enable-pcapconfig
 TCPREPLAY_DEPENDENCIES = libpcap
+# We're patching configure.ac
+TCPREPLAY_AUTORECONF = YES
 
 ifeq ($(BR2_STATIC_LIBS),y)
 TCPREPLAY_CONF_OPTS += --enable-dynamic-link=no
 TCPREPLAY_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --libs`"
 endif
 
+ifeq ($(BR2_PACKAGE_LIBDNET),y)
+TCPREPLAY_DEPENDENCIES += libdnet
+TCPREPLAY_CONF_OPTS += --with-libdnet=$(STAGING_DIR)/usr
+else
+TCPREPLAY_CONF_OPTS += --without-libdnet
+endif
+
 ifeq ($(BR2_PACKAGE_TCPDUMP),y)
 TCPREPLAY_CONF_ENV += ac_cv_path_tcpdump_path=/usr/sbin/tcpdump
 else
Signature · 1 line
2.20.1
#5 lore raw

PATCH 1/3 package/tcpreplay: security bump to version 4.3.2

In reply to Fabrice Fontaine
Quoted 7 lines · On Tue, 13 Aug 2019 21:23:38 +0200 Fabrice Fontaine…

This release contains bug fixes only:

- CVE-2019-8381 memory access in do_checksum() (#538)
- CVE-2019-8376 NULL pointer dereference get_layer4_v6() (#537)
- CVE-2019-8377 NULL pointer dereference get_ipv6_l4proto() (#536)
- Rename Ethereal to Wireshark (#545)

Quoted 5 lines
---
 package/tcpreplay/tcpreplay.hash | 4 ++--
 package/tcpreplay/tcpreplay.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Series applied to master, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

PATCH 1/3 package/tcpreplay: security bump to version 4.3.2

In reply to Fabrice Fontaine
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

This release contains bug fixes only:
- CVE-2019-8381 memory access in do_checksum() (#538)
- CVE-2019-8376 NULL pointer dereference get_layer4_v6() (#537)
- CVE-2019-8377 NULL pointer dereference get_ipv6_l4proto() (#536)
- Rename Ethereal to Wireshark (#545)

Committed to 2019.02.x and 2019.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard