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 1EE27A04EF for ; Tue, 3 Dec 2019 19:28:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CA0D41BF99; Tue, 3 Dec 2019 19:28:46 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 093331BF97 for ; Tue, 3 Dec 2019 19:28:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397725; 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=IOLVkd/CEAHouCfU8TJTbdO6ILEWPiFoA/G0LSAWInk=; b=etl627cdlXLaDg2eo6fQUYCSCJ9HKsKo+Srvfdl+v5kV7bOEje23chDNg0HU74KYhrVv8e /8jWUfanmn7xZ0kbnnZqtt2YSGOVZFYFBrvOy/mBhwVhZPaSfN3hDXvBz1O1nNEDpySXqa jyx9HlcK6LR0k3vTP+faeXz8tHtJREo= 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-410-JVMQdctsP_Wje-RFbZ3aFw-1; Tue, 03 Dec 2019 13:28:44 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 334DB107ACC4; Tue, 3 Dec 2019 18:28:43 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 271F05C240; Tue, 3 Dec 2019 18:28:41 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Olivier Matz , dpdk stable Date: Tue, 3 Dec 2019 18:26:49 +0000 Message-Id: <20191203182714.17297-40-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: JVMQdctsP_Wje-RFbZ3aFw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'test/mbuf: fix forged mbuf in clone test' 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/10/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/b8308a0ca12c8c921d= 4685eadae32bbbd5daf935 Thanks. Kevin. --- >From b8308a0ca12c8c921d4685eadae32bbbd5daf935 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 8 Oct 2019 09:33:46 -0700 Subject: [PATCH] test/mbuf: fix forged mbuf in clone test [ upstream commit 1636775425456d021b4ab0dd0b312edc8fbd78b8 ] The test for cloning changed mbuf would generate an mbuf whose length and segments count were invalid. This would cause a crash if test was run with mbuf debugging enabled. Fixes: 4ccd2bb3a9e2 ("app/test: enhance mbuf refcnt check") Fixes: af75078fece3 ("first public release") Signed-off-by: Stephen Hemminger Acked-by: Olivier Matz --- test/test/test_mbuf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/test/test_mbuf.c b/test/test/test_mbuf.c index 9e82a20be..49e7f9082 100644 --- a/test/test/test_mbuf.c +++ b/test/test/test_mbuf.c @@ -332,6 +332,9 @@ testclone_testupdate_testdetach(struct rte_mempool *pkt= mbuf_pool) =09if (m->next =3D=3D NULL) =09=09GOTO_FAIL("Next Pkt Null\n"); +=09m->nb_segs =3D 2; =20 =09rte_pktmbuf_append(m->next, sizeof(uint32_t)); +=09m->pkt_len =3D 2 * sizeof(uint32_t); + =09data =3D rte_pktmbuf_mtod(m->next, unaligned_uint32_t *); =09*data =3D MAGIC_DATA; --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:54.125432419 +0000 +++ 0040-test-mbuf-fix-forged-mbuf-in-clone-test.patch=092019-12-03 17:29:5= 1.765749641 +0000 @@ -1 +1 @@ -From 1636775425456d021b4ab0dd0b312edc8fbd78b8 Mon Sep 17 00:00:00 2001 +From b8308a0ca12c8c921d4685eadae32bbbd5daf935 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1636775425456d021b4ab0dd0b312edc8fbd78b8 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - app/test/test_mbuf.c | 3 +++ + test/test/test_mbuf.c | 3 +++ @@ -20,5 +21,5 @@ -diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c -index 2a97afe20..aafad0cf6 100644 ---- a/app/test/test_mbuf.c -+++ b/app/test/test_mbuf.c -@@ -333,6 +333,9 @@ testclone_testupdate_testdetach(struct rte_mempool *pk= tmbuf_pool) +diff --git a/test/test/test_mbuf.c b/test/test/test_mbuf.c +index 9e82a20be..49e7f9082 100644 +--- a/test/test/test_mbuf.c ++++ b/test/test/test_mbuf.c +@@ -332,6 +332,9 @@ testclone_testupdate_testdetach(struct rte_mempool *pk= tmbuf_pool)