From nobody Tue May 13 11:29:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 153263916102115.030229980960257; Thu, 26 Jul 2018 14:06:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3726A85A05; Thu, 26 Jul 2018 21:05:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 020563001A58; Thu, 26 Jul 2018 21:05:59 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A14C024C26; Thu, 26 Jul 2018 21:05:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6QL5ubX025110 for ; Thu, 26 Jul 2018 17:05:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id D08755ED3A; Thu, 26 Jul 2018 21:05:56 +0000 (UTC) Received: from mx1.redhat.com (ext-mx17.extmail.prod.ext.phx2.redhat.com [10.5.110.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C63A4607A7 for ; Thu, 26 Jul 2018 21:05:55 +0000 (UTC) Received: from mail-pl0-f51.google.com (mail-pl0-f51.google.com [209.85.160.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D47823002C76 for ; Thu, 26 Jul 2018 21:05:46 +0000 (UTC) Received: by mail-pl0-f51.google.com with SMTP id w3-v6so1345575plq.2 for ; Thu, 26 Jul 2018 14:05:46 -0700 (PDT) Received: from centos.localdomain ([42.106.3.93]) by smtp.gmail.com with ESMTPSA id z10-v6sm3279182pfh.83.2018.07.26.14.05.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 14:05:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=MjEs0/ehFzFTpbvH3tGB1qCdKivwclf8I0tFelBaF4c=; b=QQyilVtxQKHu6I/mG4Wsi+E9e1yU/6rv0s/8Obhb/+I87N/wPg6D4gOcUfZyRWtF6x eMJLqM0SIJXByrxMneagUo1Lw0bdOJSi+Gr0I+trMvE3qX8DklUmtOjpixLxxvA5fxMl PqJBp3aHoE03ArziJjBIMyyLDYKB8JpbMpkKhgtH4Nwk7zcMQj/m0bNCLC+d6VoLo0Uf J8uNgjBx5EyV2PNO5UixN+JLPVKD0DFU5PGWAH3jM3+A07R9BRedyIgAq91GZQVoTj4R Us4yVYbtS/lymxTaYygoiIYQddRkgpnsPJFY3e4TzuF1cijDfkZCyYYWuB8RpYoZRz21 ZFbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=MjEs0/ehFzFTpbvH3tGB1qCdKivwclf8I0tFelBaF4c=; b=Ac0Kh6NHz4Cswvy/G2MjJXHpXm6/s+NSL32P88tqbOAehNFmOmAPp2sUKY3zDaq+yy 6MLGkaUy522THvG7ev0DeX2AtecZ7WJf+Dkp/TNbmytYVewkDkHWBdXG4PoJpeVbTE6K MhI6m5GEV0KedyOsNGi814/aFWGzkUfuwYboqCfcXhX8EM8jyzgii0LQ53/BOUdVh2LV 5HuKFD+rGvc9AxmKjHIEAGoFCWcK1/3IwoaPd3Pg0LEcTWrBYhzSTB73eKEOfdEU9pW5 L/ve3JCXm7Z66sZP7ey+j1KXI3n0dyQp9FpeYamDJQdOtlopd8cmEc6bcuHPp1ftoL4e gHJA== X-Gm-Message-State: AOUpUlEX6eabxjGvqMIgSioOu8wWuDS8Q6ogHnKEcHg+U/jsqzI3yTvT 5RRdpBIxcJ/lkKdXuCFwW3TDGh7F X-Google-Smtp-Source: AAOMgpfh+T9/xKdF7ttj7cO8zTdlWPwNwoJn/y5+A5a6TmhkaRbb1FLCAEvnXJOHFQKlO567wfuibg== X-Received: by 2002:a17:902:5281:: with SMTP id a1-v6mr3344466pli.73.1532639146054; Thu, 26 Jul 2018 14:05:46 -0700 (PDT) From: Sukrit Bhatnagar To: libvir-list@redhat.com Date: Tue, 24 Jul 2018 21:22:36 +0530 Message-Id: <1532447562-24010-36-git-send-email-skrtbhtngr@gmail.com> In-Reply-To: <1532447562-24010-1-git-send-email-skrtbhtngr@gmail.com> References: <1532447562-24010-1-git-send-email-skrtbhtngr@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 26 Jul 2018 21:05:54 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 26 Jul 2018 21:05:54 +0000 (UTC) for IP:'209.85.160.51' DOMAIN:'mail-pl0-f51.google.com' HELO:'mail-pl0-f51.google.com' FROM:'skrtbhtngr@gmail.com' RCPT:'' X-RedHat-Spam-Score: 1.37 * (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_WEB, SPF_PASS) 209.85.160.51 mail-pl0-f51.google.com 209.85.160.51 mail-pl0-f51.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.46 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 35/41] util: iptables: use VIR_AUTOFREE instead of VIR_FREE for scalar types X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 26 Jul 2018 21:05:59 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" By making use of GNU C's cleanup attribute handled by the VIR_AUTOFREE macro for declaring scalar variables, majority of the VIR_FREE calls can be dropped, which in turn leads to getting rid of most of our cleanup sections. Signed-off-by: Sukrit Bhatnagar Reviewed-by: Erik Skultety --- src/util/viriptables.c | 52 +++++++++++++++++-----------------------------= ---- 1 file changed, 18 insertions(+), 34 deletions(-) diff --git a/src/util/viriptables.c b/src/util/viriptables.c index e921954..e65e8dc 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -215,7 +215,7 @@ static char *iptablesFormatNetwork(virSocketAddr *netad= dr, unsigned int prefix) { virSocketAddr network; - char *netstr; + VIR_AUTOFREE(char *) netstr =3D NULL; char *ret; =20 if (!(VIR_SOCKET_ADDR_IS_FAMILY(netaddr, AF_INET) || @@ -238,7 +238,6 @@ static char *iptablesFormatNetwork(virSocketAddr *netad= dr, =20 ignore_value(virAsprintf(&ret, "%s/%d", netstr, prefix)); =20 - VIR_FREE(netstr); return ret; } =20 @@ -254,7 +253,7 @@ iptablesForwardAllowOut(virFirewallPtr fw, const char *physdev, int action) { - char *networkstr; + VIR_AUTOFREE(char *) networkstr =3D NULL; virFirewallLayer layer =3D VIR_SOCKET_ADDR_FAMILY(netaddr) =3D=3D AF_I= NET ? VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; =20 @@ -279,7 +278,6 @@ iptablesForwardAllowOut(virFirewallPtr fw, "--jump", "ACCEPT", NULL); =20 - VIR_FREE(networkstr); return 0; } =20 @@ -343,7 +341,7 @@ iptablesForwardAllowRelatedIn(virFirewallPtr fw, { virFirewallLayer layer =3D VIR_SOCKET_ADDR_FAMILY(netaddr) =3D=3D AF_I= NET ? VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; - char *networkstr; + VIR_AUTOFREE(char *) networkstr =3D NULL; =20 if (!(networkstr =3D iptablesFormatNetwork(netaddr, prefix))) return -1; @@ -370,7 +368,6 @@ iptablesForwardAllowRelatedIn(virFirewallPtr fw, "--jump", "ACCEPT", NULL); =20 - VIR_FREE(networkstr); return 0; } =20 @@ -432,7 +429,7 @@ iptablesForwardAllowIn(virFirewallPtr fw, { virFirewallLayer layer =3D VIR_SOCKET_ADDR_FAMILY(netaddr) =3D=3D AF_I= NET ? VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; - char *networkstr; + VIR_AUTOFREE(char *) networkstr =3D NULL; =20 if (!(networkstr =3D iptablesFormatNetwork(netaddr, prefix))) return -1; @@ -454,7 +451,6 @@ iptablesForwardAllowIn(virFirewallPtr fw, "--out-interface", iface, "--jump", "ACCEPT", NULL); - VIR_FREE(networkstr); return 0; } =20 @@ -661,12 +657,11 @@ iptablesForwardMasquerade(virFirewallPtr fw, const char *protocol, int action) { - int ret =3D -1; - char *networkstr =3D NULL; - char *addrStartStr =3D NULL; - char *addrEndStr =3D NULL; - char *portRangeStr =3D NULL; - char *natRangeStr =3D NULL; + VIR_AUTOFREE(char *) networkstr =3D NULL; + VIR_AUTOFREE(char *) addrStartStr =3D NULL; + VIR_AUTOFREE(char *) addrEndStr =3D NULL; + VIR_AUTOFREE(char *) portRangeStr =3D NULL; + VIR_AUTOFREE(char *) natRangeStr =3D NULL; virFirewallRulePtr rule; =20 if (!(networkstr =3D iptablesFormatNetwork(netaddr, prefix))) @@ -677,15 +672,15 @@ iptablesForwardMasquerade(virFirewallPtr fw, virReportError(VIR_ERR_INTERNAL_ERROR, _("Attempted to NAT '%s'. NAT is only supported for= IPv4."), networkstr); - goto cleanup; + return -1; } =20 if (VIR_SOCKET_ADDR_IS_FAMILY(&addr->start, AF_INET)) { if (!(addrStartStr =3D virSocketAddrFormat(&addr->start))) - goto cleanup; + return -1; if (VIR_SOCKET_ADDR_IS_FAMILY(&addr->end, AF_INET)) { if (!(addrEndStr =3D virSocketAddrFormat(&addr->end))) - goto cleanup; + return -1; } } =20 @@ -718,7 +713,7 @@ iptablesForwardMasquerade(virFirewallPtr fw, if (port->start < port->end && port->end < 65536) { if (virAsprintf(&portRangeStr, ":%u-%u", port->start, port->end) < 0) - goto cleanup; + return -1; } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid port range '%u-%u'."), @@ -739,7 +734,7 @@ iptablesForwardMasquerade(virFirewallPtr fw, } =20 if (r < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, rule, "--jump", "SNAT", @@ -753,14 +748,7 @@ iptablesForwardMasquerade(virFirewallPtr fw, "--to-ports", &portRangeStr[1], NULL= ); } =20 - ret =3D 0; - cleanup: - VIR_FREE(networkstr); - VIR_FREE(addrStartStr); - VIR_FREE(addrEndStr); - VIR_FREE(portRangeStr); - VIR_FREE(natRangeStr); - return ret; + return 0; } =20 /** @@ -827,8 +815,7 @@ iptablesForwardDontMasquerade(virFirewallPtr fw, const char *destaddr, int action) { - int ret =3D -1; - char *networkstr =3D NULL; + VIR_AUTOFREE(char *) networkstr =3D NULL; =20 if (!(networkstr =3D iptablesFormatNetwork(netaddr, prefix))) return -1; @@ -838,7 +825,7 @@ iptablesForwardDontMasquerade(virFirewallPtr fw, virReportError(VIR_ERR_INTERNAL_ERROR, _("Attempted to NAT '%s'. NAT is only supported for= IPv4."), networkstr); - goto cleanup; + return -1; } =20 if (physdev && physdev[0]) @@ -859,10 +846,7 @@ iptablesForwardDontMasquerade(virFirewallPtr fw, "--jump", "RETURN", NULL); =20 - ret =3D 0; - cleanup: - VIR_FREE(networkstr); - return ret; + return 0; } =20 /** --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list