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 898F0A04F3 for ; Thu, 19 Dec 2019 15:37:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 80EB01BF8D; Thu, 19 Dec 2019 15:37:07 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id A9EDA1BF8D for ; Thu, 19 Dec 2019 15:37:06 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id f129so5857050wmf.2 for ; Thu, 19 Dec 2019 06:37:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p/lUesOv2BSh5VOuu513nhZXFRYMuk+6v7F3b2qqvHA=; b=mLUWcUjqMyVky/mYZ+JBmLEkAoQ//nc45+LbozUAhl9QVze4auyve00BYoDp8jnjIt 4/KwNLktFZZoKiAeWS6cmtg7ydbwjt2AFSFZ6Nv8/4Rs4lrYrWvWevGt8qO2z3tfWtOM fMmXeuNOhaCIYoWWSwgKJVxAXmLQRocnqtSoM9GuZG+6gGfziJK8LThoL8ZfVgwIMDJZ 2svxZDzr3jd2uD+QamzwFitJ+X4KYe8x+znDFQ8OR9Yc1Le9wTF/qB6yrLAKHK6uMC01 mmggeFga93SK96w7nj2g3qRWWRlgYMAaq/OeBMteB8HLhZHVVjVNpLlEA4YUjM2usy+u V/gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p/lUesOv2BSh5VOuu513nhZXFRYMuk+6v7F3b2qqvHA=; b=uROlpxmza2iWPBBZkGZO4wqh2Xuu57fqGWz22HluuHkGjzpWjfGdYh75/ZD0KhDPRe Szd6dhzjuKj6aLeMdAazzmV7a87VKOS5cd9/eH0ER8YwG4IszS8Q5jrGgKINn2Gdva/9 rqZMTwj/2lWv4NrDLtVrruB7SbmFDYtLA/zLZHSi2AX+RcohhTJBaJNpHcjnvxsQa0lI K/N9PD1DpS8+bGVFVh1wvFcH6S1+sH7nvfEPTh4MPjV1iMoUXaezRnYlBICbokJ/D8DO OnLzVJdNbIIa4DbkppiAj0+e4g1mE5kKgpApYW8PclaPtf1IgK82KraVNAdLItFJm6JK AFkw== X-Gm-Message-State: APjAAAWEko/VDRZib+rE2j1U1nKtraOM8C25fnFLCB6KbSLMKr8TYJ7x lwzzWlYLoNCaT0XhGWD3p5o= X-Google-Smtp-Source: APXvYqz98kOxYW7NjJDyhV7ugJUCbnK9gDJm0uZixsSxRagXPIOrcEdGsdBd530q87DYWJ84Nho8fA== X-Received: by 2002:a05:600c:2488:: with SMTP id 8mr10242703wms.152.1576766226308; Thu, 19 Dec 2019 06:37:06 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id k7sm6214980wmi.19.2019.12.19.06.37.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:37:05 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Olivier Matz , dpdk stable Date: Thu, 19 Dec 2019 14:33:18 +0000 Message-Id: <20191219143447.21506-51-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/mbuf: fix forged mbuf in clone test' has been queued to LTS release 17.11.10 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 17.11.10 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/21/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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 0e6d183c89f7314d453b00093c8b9e9380823f27 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 414509b203..73382ba13e 100644 --- a/test/test/test_mbuf.c +++ b/test/test/test_mbuf.c @@ -360,8 +360,11 @@ testclone_testupdate_testdetach(struct rte_mempool *pktmbuf_pool) m->next = rte_pktmbuf_alloc(pktmbuf_pool); if (m->next == NULL) GOTO_FAIL("Next Pkt Null\n"); + m->nb_segs = 2; rte_pktmbuf_append(m->next, sizeof(uint32_t)); + m->pkt_len = 2 * sizeof(uint32_t); + data = rte_pktmbuf_mtod(m->next, unaligned_uint32_t *); *data = MAGIC_DATA; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:28.365780745 +0000 +++ 0051-test-mbuf-fix-forged-mbuf-in-clone-test.patch 2019-12-19 14:32:26.057296874 +0000 @@ -1,27 +1,28 @@ -From 1636775425456d021b4ab0dd0b312edc8fbd78b8 Mon Sep 17 00:00:00 2001 +From 0e6d183c89f7314d453b00093c8b9e9380823f27 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") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Acked-by: Olivier Matz --- - app/test/test_mbuf.c | 3 +++ + test/test/test_mbuf.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c -index 2a97afe204..aafad0cf62 100644 ---- a/app/test/test_mbuf.c -+++ b/app/test/test_mbuf.c -@@ -332,8 +332,11 @@ testclone_testupdate_testdetach(struct rte_mempool *pktmbuf_pool) +diff --git a/test/test/test_mbuf.c b/test/test/test_mbuf.c +index 414509b203..73382ba13e 100644 +--- a/test/test/test_mbuf.c ++++ b/test/test/test_mbuf.c +@@ -360,8 +360,11 @@ testclone_testupdate_testdetach(struct rte_mempool *pktmbuf_pool) m->next = rte_pktmbuf_alloc(pktmbuf_pool); if (m->next == NULL) GOTO_FAIL("Next Pkt Null\n");