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 C48F9A04B5 for ; Wed, 23 Sep 2020 03:47:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9D90F1DBAD; Wed, 23 Sep 2020 03:47:37 +0200 (CEST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id 379311DB4D for ; Wed, 23 Sep 2020 03:47:24 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20200923014724euoutp02e3a51f69acf5c5a1d74ad71ea0598906~3RnEU-umz1896818968euoutp020 for ; Wed, 23 Sep 2020 01:47:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20200923014724euoutp02e3a51f69acf5c5a1d74ad71ea0598906~3RnEU-umz1896818968euoutp020 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1600825644; bh=gFZ/BC5QS8r9vYAoQsykBlxn+BSZtg1dnO8kDQnIEds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EyiER4wgwnHpW+LAFWXBR29qCXvZgdACLaMVK7URIi2mo00A1ix4jCiRrKdaS49Lb pV6ikcUWNWAvIMmEmDyzEGRUJHy835xzLvL2U8tOoBIlOWIm2cyTrvs/UVENHXe2i6 d5R8Nv52zEcMtRtvzLmVniU805vbt+/TSY8zwkUY= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200923014723eucas1p263d61978e55af9c9e5e491e4ce8a716c~3RnEEYPgl1707617076eucas1p2q; Wed, 23 Sep 2020 01:47:23 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id EA.7D.05997.B29AA6F5; Wed, 23 Sep 2020 02:47:23 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200923014723eucas1p2a7c7210a55289b3739faff4f5ed72e30~3RnDrWL8E2913229132eucas1p2B; Wed, 23 Sep 2020 01:47:23 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200923014723eusmtrp11224d2a810e64e6a5043fad5e4b8aaf6~3RnDqPi0q1355413554eusmtrp1L; Wed, 23 Sep 2020 01:47:23 +0000 (GMT) X-AuditID: cbfec7f4-65dff7000000176d-8e-5f6aa92b0a86 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 3A.DB.06017.B29AA6F5; Wed, 23 Sep 2020 02:47:23 +0100 (BST) Received: from Padamandas.fritz.box (unknown [106.210.88.70]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200923014722eusmtip199ef5cdbea7f4efbd2c5e989bebc9a73~3RnDEOlfU0729307293eusmtip1Q; Wed, 23 Sep 2020 01:47:22 +0000 (GMT) From: Lukasz Wojciechowski To: David Hunt , Bruce Richardson Cc: dev@dpdk.org, l.wojciechow@partner.samsung.com, stable@dpdk.org Date: Wed, 23 Sep 2020 03:47:12 +0200 Message-Id: <20200923014713.16932-8-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200923014713.16932-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKIsWRmVeSWpSXmKPExsWy7djPc7raK7PiDXo7NCxurLK36Jv0kcni 3aftTBbPetYxWvzr+MPuwOrxa8FSVo/Fe14yeRx8t4cpgDmKyyYlNSezLLVI3y6BK6Nn9wW2 givcFfOvr2JpYHzM2cXIySEhYCLxoOs4WxcjF4eQwApGib73n1hAEkICXxglLv1whkh8ZpQ4 1PSNEaajZck+qKLljBLnWzIgij4BNZyZxwqSYBOwlTgy8yuYLSIQJtHcvBeogYODWcBZ4slX NpCwsICbxOv/j8FsFgFVidUbH4DZvAKuEvufvIPaJS+xesMBZpBWTqD6p//kQVZJCFxnk1gz fS4rRI2LxLL+XWwQtrDEq+Nb2CFsGYnTk3tYIBq2MUpc/f2TEcLZzyhxvXcFVJW1xOF/v9kg jtOUWL9LHyLsKPHk2AKwxRICfBI33gqChJmBzEnbpkOFeSU62oQgqvUknvZMZYRZ+2ftExYI 20Oi4dpLVkjwXGWUOPZ4FfsERvlZCMsWMDKuYhRPLS3OTU8tNspLLdcrTswtLs1L10vOz93E CIz80/+Of9nBuOtP0iFGAQ5GJR7eF08y44VYE8uKK3MPMUpwMCuJ8DqdPR0nxJuSWFmVWpQf X1Sak1p8iFGag0VJnNd40ctYIYH0xJLU7NTUgtQimCwTB6dUA+O00BCDrUrK5xum+O1gcPtT PWenmvsalt+9EdfTjj9NZVI9f/LQt3WLLCYwJ1aZ+vMGdzxfM3/Ko99G7Ov+qh1jk6/RfP3P UeQOn12TrvKJiWVXJS4cip9494mrQiRDg6xdwZ/L1R02j1wfq3yJy1UtZcrj+TD3WtW3hSqs j4rMz12TWJF3iU2JpTgj0VCLuag4EQBC0qfk+AIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOLMWRmVeSWpSXmKPExsVy+t/xu7raK7PiDTa8FrC4screom/SRyaL d5+2M1k861nHaPGv4w+7A6vHrwVLWT0W73nJ5HHw3R6mAOYoPZui/NKSVIWM/OISW6VoQwsj PUNLCz0jE0s9Q2PzWCsjUyV9O5uU1JzMstQifbsEvYye3RfYCq5wV8y/voqlgfExZxcjJ4eE gIlEy5J9LF2MXBxCAksZJY5f2MrYxcgBlJCR+HBJAKJGWOLPtS42iJoPjBJNbxqZQBJsArYS R2Z+ZQWpFxEIkzix0h8kzCzgLrFl8VRmEFtYwE3i9f/HbCA2i4CqxOqND8BsXgFXif1P3jFC zJeXWL3hADPIGE6g+qf/5CFWNTJKzFj4mn0CI98CRoZVjCKppcW56bnFRnrFibnFpXnpesn5 uZsYgYG47djPLTsYu94FH2IU4GBU4uF98SQzXog1say4MvcQowQHs5IIr9PZ03FCvCmJlVWp RfnxRaU5qcWHGE2BjprILCWanA+MkrySeENTQ3MLS0NzY3NjMwslcd4OgYMxQgLpiSWp2amp BalFMH1MHJxSDYyWsXEGG+SVWm519ea5ZM7Y5rLl8V32ybUTF53s2Vn+L2Z21Dmf5J8bqvzM np3Zdsns1YbJcnXrE6TuZXCeX1y+KM+0WVQ+knEh1+azq3rsl3IyBGclz5Z2dpxzeAGLSJik 4S3+fa9X3nawDuaWX84mP6nIR+jUxtC35keX8TRZr/Y6uODjQXclluKMREMt5qLiRAClk355 WgIAAA== X-CMS-MailID: 20200923014723eucas1p2a7c7210a55289b3739faff4f5ed72e30 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20200923014723eucas1p2a7c7210a55289b3739faff4f5ed72e30 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200923014723eucas1p2a7c7210a55289b3739faff4f5ed72e30 References: <20200915193449.13310-1-l.wojciechow@partner.samsung.com> <20200923014713.16932-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-stable] [PATCH v2 7/8] distributor: do not use oldpkt when not needed 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" rte_distributor_request_pkt and rte_distributor_get_pkt dereferenced oldpkt parameter when in RTE_DIST_ALG_SINGLE even if number of returned buffers from worker to distributor was 0. This patch passes NULL to the legacy API when number of returned buffers is 0. This allows passing NULL as oldpkt parameter. Fixes: 775003ad2f96 ("distributor: add new burst-capable library") Cc: david.hunt@intel.com Cc: stable@dpdk.org Signed-off-by: Lukasz Wojciechowski --- lib/librte_distributor/rte_distributor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c index 12b3db33c..b720abe03 100644 --- a/lib/librte_distributor/rte_distributor.c +++ b/lib/librte_distributor/rte_distributor.c @@ -42,7 +42,7 @@ rte_distributor_request_pkt(struct rte_distributor *d, if (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) { rte_distributor_request_pkt_single(d->d_single, - worker_id, oldpkt[0]); + worker_id, count ? oldpkt[0] : NULL); return; } @@ -134,7 +134,7 @@ rte_distributor_get_pkt(struct rte_distributor *d, if (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) { if (return_count <= 1) { pkts[0] = rte_distributor_get_pkt_single(d->d_single, - worker_id, oldpkt[0]); + worker_id, return_count ? oldpkt[0] : NULL); return (pkts[0]) ? 1 : 0; } else return -EINVAL; -- 2.17.1