From patchwork Thu May 26 15:14:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 68702 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp460922qge; Thu, 26 May 2016 08:19:43 -0700 (PDT) X-Received: by 10.55.168.3 with SMTP id r3mr9795056qke.24.1464275983033; Thu, 26 May 2016 08:19:43 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 29si13365091qto.96.2016.05.26.08.19.42; Thu, 26 May 2016 08:19:43 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B5A1D617DA; Thu, 26 May 2016 15:19:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 04C7E61803; Thu, 26 May 2016 15:16:53 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 66655617E1; Thu, 26 May 2016 15:16:40 +0000 (UTC) Received: from mail-oi0-f54.google.com (mail-oi0-f54.google.com [209.85.218.54]) by lists.linaro.org (Postfix) with ESMTPS id 8AFAB617DD for ; Thu, 26 May 2016 15:14:53 +0000 (UTC) Received: by mail-oi0-f54.google.com with SMTP id j1so128952067oih.3 for ; Thu, 26 May 2016 08:14:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Hg7H6zbae7+0V6hVVHbbcZpZdMX1mnTmItDdpRmyy/A=; b=O+BeBqodpWJy60ulHki8w591lfrNQnQgccsPCuAFIzN4KAZEK43kMmF2I2vY/+61xn OF1+nkHEqTaQv9gJ/eAIRB0PkYMNKNcntz4AThBeGP/FHFTZEmjptPKG0gYQjca4czHX AtahIfrfDgKXnbDhus80nGANDLESVmuRo/JtQF63z8fWXe2SMEpLlZzbrtOsAsJkjIUm vkqeu/p96BgF7NSphEKiWl4NrFcXa6VRWggWURfiihmocTBv2e15hOLDVpl0T6LBm+aL 2PD0coW7aUkZ68RHHB0uWbPBuE8NzvxnQfVx1rajLgY/WeExy5aNtFMI5JQji7353kVS iqKA== X-Gm-Message-State: ALyK8tL4tvW1/H5NTaT3czhlsmmo7fvnOPceYJyJ7bUjRYrMsx1JQqE/QOaRGRoK2SIrrcn0kiU= X-Received: by 10.202.55.198 with SMTP id e189mr5714267oia.85.1464275693050; Thu, 26 May 2016 08:14:53 -0700 (PDT) Received: from localhost.localdomain (cpe-66-68-129-43.austin.res.rr.com. [66.68.129.43]) by smtp.gmail.com with ESMTPSA id 60sm6646041ott.13.2016.05.26.08.14.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 May 2016 08:14:52 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Thu, 26 May 2016 10:14:40 -0500 Message-Id: <1464275685-18426-6-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464275685-18426-1-git-send-email-bill.fischofer@linaro.org> References: <1464275685-18426-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv2 05/10] validation: tm: avoid resource leakage on tm queue create failure X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Bill Fischofer --- test/validation/traffic_mngr/traffic_mngr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/validation/traffic_mngr/traffic_mngr.c index e099083..82d74db 100644 --- a/test/validation/traffic_mngr/traffic_mngr.c +++ b/test/validation/traffic_mngr/traffic_mngr.c @@ -322,6 +322,8 @@ static odph_ethaddr_t dst_mac; static uint32_t cpu_unique_id; static uint32_t cpu_tcp_seq_num; +static int destroy_tm_queues(tm_queue_desc_t *queue_desc); + static void busy_wait(uint64_t nanoseconds) { odp_time_t start_time, end_time; @@ -1414,6 +1416,8 @@ static tm_node_desc_t *create_tm_node(odp_tm_t odp_tm, rc = create_tm_queue(odp_tm, tm_node, node_idx, queue_desc, priority); if (rc != 0) { + destroy_tm_queues(queue_desc); + free(node_desc); LOG_ERR("create_tm_queue() failed @ level=%u\n", level); return NULL;