From nobody Sun Feb 8 16:24:04 2026 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 1532175003621778.8316292022193; Sat, 21 Jul 2018 05:10:03 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 914EA308214E; Sat, 21 Jul 2018 12:10:01 +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 499211852D; Sat, 21 Jul 2018 12:10:00 +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 DD9554EE13; Sat, 21 Jul 2018 12:09:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6LC90v0016607 for ; Sat, 21 Jul 2018 08:09:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 223CA5B683; Sat, 21 Jul 2018 12:09:00 +0000 (UTC) Received: from mx1.redhat.com (ext-mx18.extmail.prod.ext.phx2.redhat.com [10.5.110.47]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 15E555B682 for ; Sat, 21 Jul 2018 12:09:00 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 E155030820CD for ; Sat, 21 Jul 2018 12:08:48 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id l9-v6so223535pff.9 for ; Sat, 21 Jul 2018 05:08:48 -0700 (PDT) Received: from centos.localdomain ([42.106.1.69]) by smtp.gmail.com with ESMTPSA id s16-v6sm5861694pfm.114.2018.07.21.05.08.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 05:08:47 -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=Bdj76KFhmEOQW3139BQq87JbHpHLDmD/3bmuRCYpP7Q=; b=iWKlPVGxiSy5Vevrs8g1U/M8naZ8XRv4drF3iTPQULbTaYylT1m4RovEF/losFNIUI B2zv5m+t3pr9w90owiJJtAHAofuRkHvOiuDdHkAeXVHPIvviXkHEfHz+AH2qbr81nRy2 gKwtWcWSfqrj8jWcgLcgveLCfNyYiiO8g0dt9pBOqzmudfnwnAG6zuEze65F5s2oe2A+ pbQNhhAPBvUTIGelMZXS9JANQc5BC3Rm4kgLsY/1nGvz5xmHPzWdsWVtWWlavIej0yRH TWxe9Ug2HF8nBMU7jZuZJVX7as5zhjNV1AvK/v3HDDBQofRnQVXwVT7RZaAKeACxcfQE C2+w== 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=Bdj76KFhmEOQW3139BQq87JbHpHLDmD/3bmuRCYpP7Q=; b=Pk4r8n56YECmInHvphTIfC6s0iBHuqdzEvJXL4Ctfsoyry9ojwIp1UpifBEwoj+EFB lq2b/hqXqIYjlcODbNM6bYBEopW+ym62bC2CStrxdCJcUqA0at6ItMazN8+n1CPgFhdZ wlQ+4hQ/+9Gt0idTnYscf6DF1pLyLk6G5lPXyItyW7CVfmr5qmVg45s21WrVim0YMb/A JpEBdZ4lrBR8hD4iVzdB6lZJBStrZdFAyYWg4W6EYfKEh7KK0MYGmEUtukLjAoeQt6Ln iEq7RIPzjjh/syvnZik+he5fg6Wmj2Ltza0lDUG9QnyFRKbV40ta7RUy8A62IQVf9yFn kfJw== X-Gm-Message-State: AOUpUlGfOmuKyWEfJCu4BlIgwCFcp0oosgL8UEMRfrBQgeAR/LV6Lasz hhSo2ERLA8wdNoIdIGmo6aXQ95Er X-Google-Smtp-Source: AAOMgpe9LcvHoNZS+dXzI3lCAlLF5tAPlv4q6ZbXSPawapXmzyOtPPYVi5TI+opeuaT+vWw7h7mIcw== X-Received: by 2002:a63:6092:: with SMTP id u140-v6mr5440195pgb.433.1532174928087; Sat, 21 Jul 2018 05:08:48 -0700 (PDT) From: Sukrit Bhatnagar To: libvir-list@redhat.com Date: Sat, 21 Jul 2018 17:37:06 +0530 Message-Id: <1532174832-21644-35-git-send-email-skrtbhtngr@gmail.com> In-Reply-To: <1532174832-21644-1-git-send-email-skrtbhtngr@gmail.com> References: <1532174832-21644-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.47]); Sat, 21 Jul 2018 12:08:49 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Sat, 21 Jul 2018 12:08:49 +0000 (UTC) for IP:'209.85.210.177' DOMAIN:'mail-pf1-f177.google.com' HELO:'mail-pf1-f177.google.com' FROM:'skrtbhtngr@gmail.com' RCPT:'' X-RedHat-Spam-Score: 1.311 * (DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, NML_ADSP_CUSTOM_MED, SPF_PASS, T_DKIM_INVALID) 209.85.210.177 mail-pf1-f177.google.com 209.85.210.177 mail-pf1-f177.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.47 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v1 34/40] 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Sat, 21 Jul 2018 12:10:02 +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