From patchwork Wed May 25 23:36:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 68654 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp113612qge; Wed, 25 May 2016 16:46:37 -0700 (PDT) X-Received: by 10.55.174.68 with SMTP id x65mr6442206qke.184.1464219997218; Wed, 25 May 2016 16:46:37 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id j107si1419488qgf.82.2016.05.25.16.46.37; Wed, 25 May 2016 16:46:37 -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 E4E65617EF; Wed, 25 May 2016 23:46:36 +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_H2, 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 49F89617F6; Wed, 25 May 2016 23:45:51 +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 57977616B1; Wed, 25 May 2016 23:45:39 +0000 (UTC) Received: from mail-oi0-f48.google.com (mail-oi0-f48.google.com [209.85.218.48]) by lists.linaro.org (Postfix) with ESMTPS id 53F576161B for ; Wed, 25 May 2016 23:45:28 +0000 (UTC) Received: by mail-oi0-f48.google.com with SMTP id w184so92728523oiw.2 for ; Wed, 25 May 2016 16:45:28 -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=9f18R+ibiE9Vxr6TIGK1dTJCYsK2YlrIWiIrIcaixj4=; b=eRtyDNUh4xgwv+o/EZcW9OuwqATMxhCCN6OqWHkQmk0Ngim4DNVBZBLY8RD47mY73g 7dUQEqfXT9XoRYN1s1HtaYSw1f99DZCgMXxymlp9nlaPU0pfGIxQb66YdJPtX8gN/mfX 7YWZ6dl2fWE9N0Hv8ZYWw4I4JybbJ4ETtwm0oBdtpAvQfIjz8yE6C/hIdu9j8STPI3q+ +h9Is1Mm8Nwnu9PToTwj2MVOlvXq2Z1ilqxnO0lWp7kSdF3DbabtHwohPS1n7M6rDsJX QBo1CyZaRh3UuedNY9U2yqEsQYTubhosOeRVUiC84esUNRExAEsB+Bk305g46Q7d7Q34 +kYQ== X-Gm-Message-State: ALyK8tIc5j7Ti5nGsqHOAuQvZshgt9pGi4fB4+54fX84h22bt47o/URw4/1DJCHUD4HbOn7SIBY= X-Received: by 10.202.48.139 with SMTP id w133mr3380865oiw.61.1464219435531; Wed, 25 May 2016 16:37:15 -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 l65sm5103562otc.28.2016.05.25.16.37.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 May 2016 16:37:15 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Wed, 25 May 2016 18:36:58 -0500 Message-Id: <1464219423-14977-6-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464219423-14977-1-git-send-email-bill.fischofer@linaro.org> References: <1464219423-14977-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 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..6b845b7 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;