From patchwork Tue Feb 24 08:10:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alvaro Neira X-Patchwork-Id: 442829 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B254D140182 for ; Tue, 24 Feb 2015 19:10:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752385AbbBXIK2 (ORCPT ); Tue, 24 Feb 2015 03:10:28 -0500 Received: from mail-wg0-f44.google.com ([74.125.82.44]:46951 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751044AbbBXIK1 (ORCPT ); Tue, 24 Feb 2015 03:10:27 -0500 Received: by wggy19 with SMTP id y19so3573437wgg.13 for ; Tue, 24 Feb 2015 00:10:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=clOVQrdpO4jtmDK4We2aH8ciFC1yb7unewJD7+cv1Lc=; b=Ubm/zG8/5dm/2bNEdZnAOiwVROlGG4acGTIetMU8OmhT+vDPWPsxnXaN55Cfb3IRWE ju7di88oH3JciWjVn3bNKVkqZEOSQcGsN3eEYytd0YgmSknYymP1KWNbC9qdsLLxdbwW gg02cswaXjcS39wa+csMHZhYumXj3qczS3SoxvDj3yp38GsB6SgA8mccRAq6Hp3Pg5Uf BXhDgl5yfaxlrl2fu/9ylamY694UCjbli2Cslq3ULsV5CeUINoNQD8lyVv5WHowh+s4X JiTn+zEPj0cymFlWGtvZbTSF+M7OXIeGcVPyU8ttDye8WaxiTLSa+9xKKBQZRqwuWf4X BQIg== X-Received: by 10.180.89.173 with SMTP id bp13mr27501815wib.91.1424765426641; Tue, 24 Feb 2015 00:10:26 -0800 (PST) Received: from localhost.localdomain ([77.231.217.213]) by mx.google.com with ESMTPSA id mb20sm19357878wic.18.2015.02.24.00.10.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Feb 2015 00:10:26 -0800 (PST) From: Alvaro Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [libnftnl PATCH] ruleset: crash in path error when we build the xml tree Date: Tue, 24 Feb 2015 09:10:33 +0100 Message-Id: <1424765433-4975-2-git-send-email-alvaroneay@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1424765433-4975-1-git-send-email-alvaroneay@gmail.com> References: <1424765433-4975-1-git-send-email-alvaroneay@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Crash when we try to release a tree that is not initialized. Signed-off-by: Alvaro Neira Ayuso --- src/ruleset.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ruleset.c b/src/ruleset.c index 9e8965c..8549130 100644 --- a/src/ruleset.c +++ b/src/ruleset.c @@ -669,8 +669,10 @@ static int nft_ruleset_xml_parse(const void *xml, struct nft_parse_err *err, nft_ruleset_ctx_set(&ctx, NFT_RULESET_CTX_DATA, arg); tree = nft_mxml_build_tree(xml, "nftables", err, input); - if (tree == NULL) - goto err; + if (tree == NULL) { + nft_set_list_free(ctx.set_list); + return -1; + } ctx.xml = tree;