[dpdk-stable] patch 'test/mbuf: fix forged mbuf in clone test' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Tue Dec 3 19:26:49 CET 2019


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 rebasing
(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/b8308a0ca12c8c921d4685eadae32bbbd5daf935

Thanks.

Kevin.

---
>From b8308a0ca12c8c921d4685eadae32bbbd5daf935 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
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 <stephen at networkplumber.org>
Acked-by: Olivier Matz <olivier.matz at 6wind.com>
---
 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 *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.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-03 17:29:54.125432419 +0000
+++ 0040-test-mbuf-fix-forged-mbuf-in-clone-test.patch	2019-12-03 17:29:51.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 at 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 *pktmbuf_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 *pktmbuf_pool)



More information about the stable mailing list