From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7B50FA04F5 for ; Wed, 11 Dec 2019 22:29:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6543A1BC25; Wed, 11 Dec 2019 22:29:01 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 4B0B61D9E for ; Wed, 11 Dec 2019 22:29:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N4Kw6V57t+5Hze+0BvAKnvnBJps8FFlrHeYUX2isdnk=; b=jOlaJFX4ifG/6lNi1V3MawlowSeIS9r+XSKOKmyv7LAj3+gKJow2p3PsVSOj3COJW5FF6e ygN5T0IQfNxD9u+E8IjRcxLvt0jhsYZXUZ95z+pYd7E9LilGOY7nLXpBNxlXdCH5PJc4eJ o6WjxsbFvkecdT+L31DP+ENaXj/YVmI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-270-ATKNhwLvNFuuMjIvTmJ_ig-1; Wed, 11 Dec 2019 16:28:56 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 67EFF801E70; Wed, 11 Dec 2019 21:28:55 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FC7C10013A1; Wed, 11 Dec 2019 21:28:54 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Bruce Richardson , dpdk stable Date: Wed, 11 Dec 2019 21:26:39 +0000 Message-Id: <20191211212702.27851-47-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: ATKNhwLvNFuuMjIvTmJ_ig-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'mk: remove library search path from binary' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/17/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/72803887d351a6ba3b= 58aa37ba7801f978711d4f Thanks. Kevin. --- >From 72803887d351a6ba3b58aa37ba7801f978711d4f Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 22 Nov 2019 11:30:23 +0000 Subject: [PATCH] mk: remove library search path from binary [ upstream commit 6b01864cc9c59a731dbc727a96995fd2b2ff452f ] This patch functionally reverts the patch in fixes line to not have any hardcoded library path in the final binary for the security reasons, in case this binary distributed to production environment. RPATH only added in RTE_DEVEL_BUILD case and this binary shouldn't distributed, but still removing it to be cautious. Fixes: 8919f73bcbaa ("mk: add build directory to library search path") Suggested-by: Bruce Richardson Signed-off-by: Ferruh Yigit --- devtools/test-null.sh | 1 + mk/rte.app.mk | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/devtools/test-null.sh b/devtools/test-null.sh index 61879e3e6..da0401dff 100755 --- a/devtools/test-null.sh +++ b/devtools/test-null.sh @@ -9,4 +9,5 @@ coremask=3D${2:-3} # default using cores 0 and 1 =20 if grep -q SHARED_LIB=3Dy $build/.config; then +=09export LD_LIBRARY_PATH=3D$build/lib:$LD_LIBRARY_PATH =09pmd=3D'-d librte_pmd_null.so' fi diff --git a/mk/rte.app.mk b/mk/rte.app.mk index c539bb9c3..8d91909be 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -334,8 +334,4 @@ filter-libs =3D \ LDLIBS :=3D $(call filter-libs,$(LDLIBS)) =20 -ifeq ($(RTE_DEVEL_BUILD)$(CONFIG_RTE_BUILD_SHARED_LIB),yy) -LDFLAGS +=3D -rpath=3D$(RTE_SDK_BIN)/lib -endif - MAPFLAGS =3D -Map=3D$@.map --cref =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:16.440330059 +0000 +++ 0047-mk-remove-library-search-path-from-binary.patch=092019-12-11 21:24= :12.706650411 +0000 @@ -1 +1 @@ -From 6b01864cc9c59a731dbc727a96995fd2b2ff452f Mon Sep 17 00:00:00 2001 +From 72803887d351a6ba3b58aa37ba7801f978711d4f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6b01864cc9c59a731dbc727a96995fd2b2ff452f ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - devtools/test-null.sh | 2 ++ + devtools/test-null.sh | 1 + @@ -21 +22 @@ - 2 files changed, 2 insertions(+), 4 deletions(-) + 2 files changed, 1 insertion(+), 4 deletions(-) @@ -24 +25 @@ -index d82c6ad19..72aa82b16 100755 +index 61879e3e6..da0401dff 100755 @@ -27,7 +28 @@ -@@ -12,4 +12,5 @@ eal_options=3D$3 - testpmd_options=3D$4 -=20 -+[ -f "$testpmd" ] && build=3D$(dirname $(dirname $testpmd)) - [ -f "$testpmd" ] || testpmd=3D$build/app/dpdk-testpmd - [ -f "$testpmd" ] || testpmd=3D$build/app/testpmd -@@ -20,4 +21,5 @@ fi +@@ -9,4 +9,5 @@ coremask=3D${2:-3} # default using cores 0 and 1 @@ -35 +30 @@ - if ldd $testpmd | grep -q librte_ ; then + if grep -q SHARED_LIB=3Dy $build/.config; then @@ -37,2 +32,2 @@ - =09libs=3D'-d librte_mempool_ring.so -d librte_pmd_null.so' - else + =09pmd=3D'-d librte_pmd_null.so' + fi @@ -40 +35 @@ -index a278552c6..05ea034b9 100644 +index c539bb9c3..8d91909be 100644 @@ -43 +38 @@ -@@ -380,8 +380,4 @@ filter-libs =3D \ +@@ -334,8 +334,4 @@ filter-libs =3D \