[dpdk-stable] patch 'raw/skeleton: fix test of attribute set/get' has been queued to LTS release 18.11.3

Kevin Traynor ktraynor at redhat.com
Fri Aug 23 11:43:17 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/28/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/259104066dff55a6e60d6570247b474c6ffaea4a

Thanks.

Kevin Traynor

---
>From 259104066dff55a6e60d6570247b474c6ffaea4a Mon Sep 17 00:00:00 2001
From: Thinh Tran <thinhtr at linux.vnet.ibm.com>
Date: Tue, 11 Jun 2019 16:44:12 -0500
Subject: [PATCH] raw/skeleton: fix test of attribute set/get

[ upstream commit dcb1595956e366a15f9b33998b37172ee29da1e1 ]

Using memory on the stack instead of on the heap by calling malloc
also avoid memory leak in case of test case failures

Fixes: 88d0e47880ec ("raw/skeleton: fix memory leak on test failure")

Signed-off-by: Thinh Tran <thinhtr at linux.vnet.ibm.com>
Acked-by: Shreyansh Jain <shreyansh.jain at nxp.com>
---
 drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c b/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
index 359c9e296..3250c2296 100644
--- a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
+++ b/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
@@ -275,5 +275,5 @@ test_rawdev_attr_set_get(void)
 {
 	int ret;
-	int *dummy_value;
+	int *dummy_value, set_value;
 	uint64_t ret_value;
 
@@ -282,8 +282,5 @@ test_rawdev_attr_set_get(void)
 	RTE_TEST_ASSERT(!ret, "Unable to set an attribute (Test1)");
 
-	dummy_value = malloc(sizeof(int));
-	if (!dummy_value)
-		RTE_TEST_ASSERT(1, "Unable to allocate memory (dummy_value)");
-
+	dummy_value = &set_value;
 	*dummy_value = 200;
 	ret = rte_rawdev_set_attr(TEST_DEV_ID, "Test2", (uintptr_t)dummy_value);
@@ -295,9 +292,7 @@ test_rawdev_attr_set_get(void)
 			      ret_value);
 
-	free(dummy_value);
-
 	ret_value = 0;
 	ret = rte_rawdev_get_attr(TEST_DEV_ID, "Test2", &ret_value);
-	RTE_TEST_ASSERT_EQUAL(*((int *)(uintptr_t)ret_value), 200,
+	RTE_TEST_ASSERT_EQUAL(*((int *)(uintptr_t)ret_value), set_value,
 			      "Attribute (Test2) not set correctly (%" PRIu64 ")",
 			      ret_value);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.219791830 +0100
+++ 0027-raw-skeleton-fix-test-of-attribute-set-get.patch	2019-08-22 19:38:20.447026641 +0100
@@ -1 +1 @@
-From dcb1595956e366a15f9b33998b37172ee29da1e1 Mon Sep 17 00:00:00 2001
+From 259104066dff55a6e60d6570247b474c6ffaea4a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dcb1595956e366a15f9b33998b37172ee29da1e1 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list