From patchwork Wed Sep 11 21:18:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1161292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WoXWU2Cu"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46TFDV0hHWz9s00 for ; Thu, 12 Sep 2019 07:20:26 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 977E3CD1; Wed, 11 Sep 2019 21:18:47 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 3235FB1F for ; Wed, 11 Sep 2019 21:18:45 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id DDACE82B for ; Wed, 11 Sep 2019 21:18:44 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id j191so1631616pgd.3 for ; Wed, 11 Sep 2019 14:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Mbu4Nt40j427Y7/KoYfd1WRO74CdP/my9Zl9kQJZ6zo=; b=WoXWU2CuFePRDUVYeo9F0CsYFFMGGAkaTnBF5Lsjpz9JlqJZ9OAMn/Z8/4fkxW4Sha PVrSjKxnuKATLF44kf5FlsbWHFegU/D/P2q6JPlilGTjlxYOBUXkAAp+uMjXcJWgmSlj O5o66K+ulwDzdJsF3Kp+6zPmzrNkurxCcMfqnqz+S7dMITE4QZw2VhkwT8GvIZHbqDsD rHR+TYmy8xBnKn2NR8RA/cXOMSiCQg/S7jUzZyAaRVv/SnXSRYDw7crxtlbdJICYudz+ LQZaAD1bqhc5AHJjCrBc+qUGORgDB3FbMphBB8kr36f+UnmTB6P0iUckmpxqtrJhmdGJ hetQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Mbu4Nt40j427Y7/KoYfd1WRO74CdP/my9Zl9kQJZ6zo=; b=Ig/C6sD2YG2qhJwhvOqBbTBosb20AZYpKMRdJcrwMyfEKssWRNMmdMvMBFMe7V/TYl UGveHuILrsJEzvw3XzxkCvDq2a7/hxYwMzWOE+q3RaVUzy13Wr6JT9eSQ6MJQcBvxF6u w3co1Hc53StOGA/6uUtvl3PuDIyLynn7W+DaMi6H7oyD0QcVGrL3tJRy/hUdKNoyYayW dY4biO5tPqyAa+UCy/mlzZ05M27snXtM5TiAgCtE+nbGdadFAjCajiAFzTduAhz9pTlN Cr1PJjXsuuRN2kbXd+BTw4jx4LARgPsWFsmb7u4qLsoU3KNYtqafBGk0gwPAWDqsPV3k zJ8A== X-Gm-Message-State: APjAAAV/4ixmoZVivDINz7Z0p4ji1Oo8xHn0n/MVLyhNXMwsbwAi75gG TRrogKrLYFghCj1F5HRGfUAObWGr X-Google-Smtp-Source: APXvYqzH1XGH/O1Fg397NeEq2TLLxVPGZ5nUAjdXixtXzeHR/qIMNEWuiUTGlYU2NNggvAaZ322tsA== X-Received: by 2002:a62:1b85:: with SMTP id b127mr36296933pfb.56.1568236724268; Wed, 11 Sep 2019 14:18:44 -0700 (PDT) Received: from kern417.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id k1sm24612487pfi.132.2019.09.11.14.18.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Sep 2019 14:18:43 -0700 (PDT) From: Yifeng Sun To: dev@openvswitch.org Date: Wed, 11 Sep 2019 14:18:30 -0700 Message-Id: <1568236716-18105-4-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1568236716-18105-1-git-send-email-pkusunyifeng@gmail.com> References: <1568236716-18105-1-git-send-email-pkusunyifeng@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 04/10] ovs-ofctl: Free leaked minimatch X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Valgrind reported: 1056: ofproto - bundle with multiple flow mods (OpenFlow 1.4) ==19220== 160 bytes in 2 blocks are definitely lost in loss record 24 of 34 ==19220== at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==19220== by 0x4979A4: xmalloc (util.c:138) ==19220== by 0x42407D: miniflow_alloc (flow.c:3340) ==19220== by 0x4296CF: minimatch_init (match.c:1758) ==19220== by 0x46273D: parse_ofp_str__ (ofp-flow.c:1759) ==19220== by 0x465B9E: parse_ofp_str (ofp-flow.c:1790) ==19220== by 0x465CE0: parse_ofp_flow_mod_str (ofp-flow.c:1817) ==19220== by 0x465DF6: parse_ofp_flow_mod_file (ofp-flow.c:1876) ==19220== by 0x410BA3: ofctl_flow_mod_file.isra.19 (ovs-ofctl.c:1773) ==19220== by 0x417933: ovs_cmdl_run_command__ (command-line.c:223) ==19220== by 0x406F68: main (ovs-ofctl.c:179) This patch fixes it. Signed-off-by: Yifeng Sun Acked-by: William Tu --- utilities/ovs-ofctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 754629d3dfbb..06289d296573 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -1724,6 +1724,7 @@ bundle_flow_mod__(const char *remote, struct ofputil_flow_mod *fms, ovs_list_push_back(&requests, &request->list_node); free(CONST_CAST(struct ofpact *, fm->ofpacts)); + minimatch_destroy(&fm->match); } bundle_transact(vconn, &requests, OFPBF_ORDERED | OFPBF_ATOMIC);