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 0BE32A046B for ; Fri, 23 Aug 2019 11:44:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 008EB1BFA7; Fri, 23 Aug 2019 11:44:56 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 53F011BFA7 for ; Fri, 23 Aug 2019 11:44:55 +0200 (CEST) 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 mx1.redhat.com (Postfix) with ESMTPS id C500918C4271; Fri, 23 Aug 2019 09:44:54 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id A754C5F9D3; Fri, 23 Aug 2019 09:44:53 +0000 (UTC) From: Kevin Traynor To: Thinh Tran Cc: Shreyansh Jain , dpdk stable Date: Fri, 23 Aug 2019 10:43:17 +0100 Message-Id: <20190823094336.12078-27-ktraynor@redhat.com> In-Reply-To: <20190823094336.12078-1-ktraynor@redhat.com> References: <20190823094336.12078-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Fri, 23 Aug 2019 09:44:54 +0000 (UTC) Subject: [dpdk-stable] patch 'raw/skeleton: fix test of attribute set/get' has been queued to LTS release 18.11.3 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.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 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 Acked-by: Shreyansh Jain --- 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@dpdk.org