From patchwork Thu Sep 30 14:04:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 1534856 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4HKw3h0YKRz9sR4 for ; Fri, 1 Oct 2021 00:04:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351742AbhI3OGa (ORCPT ); Thu, 30 Sep 2021 10:06:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351734AbhI3OG3 (ORCPT ); Thu, 30 Sep 2021 10:06:29 -0400 Received: from orbyte.nwl.cc (orbyte.nwl.cc [IPv6:2001:41d0:e:133a::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D306AC06176C for ; Thu, 30 Sep 2021 07:04:46 -0700 (PDT) Received: from localhost ([::1]:51670 helo=xic) by orbyte.nwl.cc with esmtp (Exim 4.94.2) (envelope-from ) id 1mVwg1-0007Ol-8O; Thu, 30 Sep 2021 16:04:45 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [iptables PATCH v2 04/17] xtables: Simplify addr_mask freeing Date: Thu, 30 Sep 2021 16:04:06 +0200 Message-Id: <20210930140419.6170-5-phil@nwl.cc> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210930140419.6170-1-phil@nwl.cc> References: <20210930140419.6170-1-phil@nwl.cc> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Introduce a generic 'ptr' union field to pass to free(). Signed-off-by: Phil Sutter --- iptables/nft-shared.h | 2 ++ iptables/xtables.c | 15 ++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h index 71094a28e73de..44ad0811f4081 100644 --- a/iptables/nft-shared.h +++ b/iptables/nft-shared.h @@ -177,6 +177,7 @@ struct addr_mask { union { struct in_addr *v4; struct in6_addr *v6; + void *ptr; } addr; unsigned int naddrs; @@ -184,6 +185,7 @@ struct addr_mask { union { struct in_addr *v4; struct in6_addr *v6; + void *ptr; } mask; }; diff --git a/iptables/xtables.c b/iptables/xtables.c index 092edaaf89224..f45e36086dcb8 100644 --- a/iptables/xtables.c +++ b/iptables/xtables.c @@ -1021,17 +1021,10 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table, nft_clear_iptables_command_state(&cs); - if (h->family == AF_INET) { - free(args.s.addr.v4); - free(args.s.mask.v4); - free(args.d.addr.v4); - free(args.d.mask.v4); - } else if (h->family == AF_INET6) { - free(args.s.addr.v6); - free(args.s.mask.v6); - free(args.d.addr.v6); - free(args.d.mask.v6); - } + free(args.s.addr.ptr); + free(args.s.mask.ptr); + free(args.d.addr.ptr); + free(args.d.mask.ptr); xtables_free_opts(1); return ret;