Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E78CAC33C8C for ; Mon, 6 Jan 2020 12:20:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B6CF32072E for ; Mon, 6 Jan 2020 12:20:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726313AbgAFMUh (ORCPT ); Mon, 6 Jan 2020 07:20:37 -0500 Received: from correo.us.es ([193.147.175.20]:43694 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726303AbgAFMUh (ORCPT ); Mon, 6 Jan 2020 07:20:37 -0500 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 33140F2DFB for ; Mon, 6 Jan 2020 13:20:35 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 1C16ADA70E for ; Mon, 6 Jan 2020 13:20:35 +0100 (CET) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 2C0A2DA737; Mon, 6 Jan 2020 13:20:27 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id E69B0DA709; Mon, 6 Jan 2020 13:20:24 +0100 (CET) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Mon, 06 Jan 2020 13:20:24 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from salvia.here (unknown [90.77.255.23]) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id C235F41E4800; Mon, 6 Jan 2020 13:20:24 +0100 (CET) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: phil@nwl.cc Subject: [PATCH 6/7] nft: skip table list release if uninitialized Date: Mon, 6 Jan 2020 13:20:17 +0100 Message-Id: <20200106122018.14090-7-pablo@netfilter.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200106122018.14090-1-pablo@netfilter.org> References: <20200106122018.14090-1-pablo@netfilter.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org # printf '%s\nCOMMIT\n' '*nat' '*raw' '*filter' | iptables-nft-restore --test && echo ok Segmentation fault Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1391 Signed-off-by: Pablo Neira Ayuso --- iptables/nft-cache.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/iptables/nft-cache.c b/iptables/nft-cache.c index 1fb65892d898..ab20eb557f4d 100644 --- a/iptables/nft-cache.c +++ b/iptables/nft-cache.c @@ -610,8 +610,10 @@ static int flush_cache(struct nft_handle *h, struct nft_cache *c, nftnl_set_list_free(c->table[i].sets); c->table[i].sets = NULL; } - nftnl_table_list_free(c->tables); - c->tables = NULL; + if (c->tables) { + nftnl_table_list_free(c->tables); + c->tables = NULL; + } return 1; } -- 2.11.0