From nobody Sun Feb 8 12:37:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1571737053; cv=none; d=zoho.com; s=zohoarc; b=BSlQ8cnvZepy55wOVncnWd6eVlg5AhnvjrpyLd3lZ6Hxm5k3RHe01OzmkiPCShzpa2oyisX5R/AnbIKwJAQJmbsOGpMeTlw8Yz8kfUL+IUYwFEKE0wFledh45tVusuXuIf3VHJ8dYL/jIaCkiJxCH+hp9frpaEoVAjLU7Qn9cdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737053; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p3mQLv8EzRxp5JRvsKn5CLb4KtaQhrPhoCtHsr4r/hY=; b=JsHwMg5p7IEgvygkwFA+qObNBC2RACkbGcXtLgZigcs4BtIM3TsC0fQhN1dCeWpPuSSUCu2Bg3d10igaWbG6SaB4pMWbM6QzMHh1CAPMy/8qiQx3QxDidgkw2keFb+r44Jes2r/y9GT6PNVC5OEiZRTCMf7dDTKBZ/K49QbBKdg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571737053158638.3295035677684; Tue, 22 Oct 2019 02:37:33 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-34-LeVMlHBANyOoJXBaxLj7fg-1; Tue, 22 Oct 2019 05:37:30 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D199E801E5C; Tue, 22 Oct 2019 09:37:25 +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 A78A01001B35; Tue, 22 Oct 2019 09:37:25 +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 69FF71A50A; Tue, 22 Oct 2019 09:37:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJoog000679 for ; Mon, 21 Oct 2019 14:19:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id D0B738E7E2; Mon, 21 Oct 2019 18:19:50 +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 CA0ED605AD for ; Mon, 21 Oct 2019 18:19:29 +0000 (UTC) Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) (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 ED2F1300CB0E for ; Mon, 21 Oct 2019 18:19:27 +0000 (UTC) Received: by mail-qt1-f181.google.com with SMTP id o49so14637000qta.7 for ; Mon, 21 Oct 2019 11:19:27 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737052; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=p3mQLv8EzRxp5JRvsKn5CLb4KtaQhrPhoCtHsr4r/hY=; b=Tm5sDVRjzbBOjIT2ch0lUGtpEZzMkA75knbxJOjKkedJ2KmVJwqzXAiIlnNgOOE4ElSubL 6gN4orzuzXic+/8Y7OywgWc81y7vAy9Ta9Frlw7VcShps6YK0hyuSuC2In+4870rJWl1yB +3ote/sWYYOibvGGdGHFcHiAyMpEkec= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=as2lkIrp1EJ8HfC5+amk1N13PGBltmb+cptnUSCpAEg=; b=XEzhNfl+hllas/Semxl83veW3TPNAGsNTVHw9srzv7qwWzwr8YLH4JV/LJu+mPle8X vXIh6aJjcIuEHqI9s/8R/jle/m3rdHhUdDldFqht/Ke36JcoXg2JDcPa3jwgmhbL0w7o vaWTfb15V/h2nWh9if46Mkhf77rl2/Rah22z7iGZZZmnt/Rw3gOn2J4cNTeYgAiWwQWL dtiSAc3+MyGUV3qy84jslrpaJEzp97tblqZLw1U5LA/neZ4apsgMlVoVWDbgZkXl5Ibh LSEW1LNTExM7trt0fvilQXcXN9cfNN8EaMI3Hs4JPMB4GPqvYKQkhYL+pabpBvxXwvf3 txEA== X-Gm-Message-State: APjAAAVlNtXssb9G2scKe5YPrx/YGAHiDfTN4B5nB6C3YoN7D+BEKkKX P8URiN/mI50ytNFqZMzDjig1x4czoDA= X-Google-Smtp-Source: APXvYqz2HuG+l8LhbwHp0rsR4W0qcDJAMzZ7IJOEOTuDv1tEEQhQQTTpU9GgsegFJBr7y92j08EiJg== X-Received: by 2002:ac8:7a97:: with SMTP id x23mr16198560qtr.38.1571681966646; Mon, 21 Oct 2019 11:19:26 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:18:53 -0300 Message-Id: <20191021181911.14986-4-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 21 Oct 2019 18:19:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 21 Oct 2019 18:19:28 +0000 (UTC) for IP:'209.85.160.181' DOMAIN:'mail-qt1-f181.google.com' HELO:'mail-qt1-f181.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.181 mail-qt1-f181.google.com 209.85.160.181 mail-qt1-f181.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.47 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 03/21] nwfilter: remove unneeded cleanup labels 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: LeVMlHBANyOoJXBaxLj7fg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/nwfilter/nwfilter_ebiptables_driver.c | 132 +++++++++------------- 1 file changed, 56 insertions(+), 76 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 50db150151..70743983ef 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -367,13 +367,12 @@ ebtablesHandleEthHdr(virFirewallPtr fw, { char macaddr[VIR_MAC_STRING_BUFLEN]; char macmask[VIR_MAC_STRING_BUFLEN]; - int ret =3D -1; =20 if (HAS_ENTRY_ITEM(ðHdr->dataSrcMACAddr)) { if (printDataType(vars, macaddr, sizeof(macaddr), ðHdr->dataSrcMACAddr) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, reverse ? "-d" : "-s", @@ -385,7 +384,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, if (printDataType(vars, macmask, sizeof(macmask), ðHdr->dataSrcMACMask) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", macaddr, macmask); @@ -398,7 +397,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, if (printDataType(vars, macaddr, sizeof(macaddr), ðHdr->dataDstMACAddr) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, reverse ? "-s" : "-d", @@ -410,7 +409,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, if (printDataType(vars, macmask, sizeof(macmask), ðHdr->dataDstMACMask) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", macaddr, macmask); @@ -419,9 +418,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -789,7 +786,6 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw, bool *srcmacskipped) { char macaddr[VIR_MAC_STRING_BUFLEN]; - int ret =3D -1; =20 *srcmacskipped =3D false; =20 @@ -802,7 +798,7 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw, if (printDataType(vars, macaddr, sizeof(macaddr), srcMacAddr) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-m", "mac", @@ -815,9 +811,7 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw, NULL); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -837,7 +831,6 @@ iptablesHandleIPHdr(virFirewallPtr fw, const char *dst =3D "--destination"; const char *srcrange =3D "--src-range"; const char *dstrange =3D "--dst-range"; - int ret =3D -1; =20 if (directionIn) { src =3D "--destination"; @@ -850,7 +843,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataSrcIPAddr) < 0) - goto cleanup; + return -1; =20 if (ENTRY_WANT_NEG_SIGN(&ipHdr->dataSrcIPAddr)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -861,7 +854,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataSrcIPMask) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", ipaddr, number); @@ -872,7 +865,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataSrcIPFrom) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-m", "iprange", @@ -886,7 +879,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddralt, sizeof(ipaddralt), &ipHdr->dataSrcIPTo) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s-%s", ipaddr, ipaddralt); @@ -899,7 +892,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataDstIPAddr) < 0) - goto cleanup; + return -1; =20 if (ENTRY_WANT_NEG_SIGN(&ipHdr->dataDstIPAddr)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -909,7 +902,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataDstIPMask) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", ipaddr, number); @@ -920,7 +913,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataDstIPFrom) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-m", "iprange", @@ -933,7 +926,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddralt, sizeof(ipaddralt), &ipHdr->dataDstIPTo) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s-%s", ipaddr, ipaddralt); @@ -946,7 +939,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataDSCP) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-m", "dscp", @@ -967,9 +960,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -983,7 +974,6 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, char number[MAX(INT_BUFSIZE_BOUND(uint32_t), INT_BUFSIZE_BOUND(int))]; char str[MAX_IPSET_NAME_LENGTH]; - int ret =3D -1; =20 if (HAS_ENTRY_ITEM(&ipHdr->dataIPSet) && HAS_ENTRY_ITEM(&ipHdr->dataIPSetFlags)) { @@ -991,7 +981,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, if (printDataType(vars, str, sizeof(str), &ipHdr->dataIPSet) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-m", "set", @@ -1001,7 +991,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, if (printDataTypeDirection(vars, str, sizeof(str), &ipHdr->dataIPSetFlags, directionIn) < = 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArg(fw, fwrule, str); } @@ -1011,7 +1001,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataConnlimitAbove) < 0) - goto cleanup; + return -1; =20 /* place connlimit after potential -m state --state ... since this is the most useful order */ @@ -1035,9 +1025,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, NULL); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -1181,7 +1169,6 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, bool hasICMPType =3D false; virFirewallRulePtr fwrule; size_t fwruleargs; - int ret =3D -1; =20 PRINT_IPT_ROOT_CHAIN(chain, chainPrefix, ifname); =20 @@ -1200,14 +1187,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.tcpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.tcpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 if (HAS_ENTRY_ITEM(&rule->p.tcpHdrFilter.dataTCPFlags)) { char *flags; @@ -1216,11 +1203,11 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, virFirewallRuleAddArg(fw, fwrule, "--tcp-flags"); =20 if (!(flags =3D virNWFilterPrintTCPFlags(rule->p.tcpHdrFilter.= dataTCPFlags.u.tcpFlags.mask))) - goto cleanup; + return -1; virFirewallRuleAddArg(fw, fwrule, flags); VIR_FREE(flags); if (!(flags =3D virNWFilterPrintTCPFlags(rule->p.tcpHdrFilter.= dataTCPFlags.u.tcpFlags.flags))) - goto cleanup; + return -1; virFirewallRuleAddArg(fw, fwrule, flags); VIR_FREE(flags); } @@ -1229,13 +1216,13 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, vars, &rule->p.tcpHdrFilter.portData, directionIn) < 0) - goto cleanup; + return -1; =20 if (HAS_ENTRY_ITEM(&rule->p.tcpHdrFilter.dataTCPOption)) { if (printDataType(vars, number, sizeof(number), &rule->p.tcpHdrFilter.dataTCPOption) < 0) - goto cleanup; + return -1; =20 if (ENTRY_WANT_NEG_SIGN(&rule->p.tcpHdrFilter.dataTCPOption)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -1259,20 +1246,20 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.udpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.udpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 if (iptablesHandlePortData(fw, fwrule, vars, &rule->p.udpHdrFilter.portData, directionIn) < 0) - goto cleanup; + return -1; break; =20 case VIR_NWFILTER_RULE_PROTOCOL_UDPLITE: @@ -1289,14 +1276,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.udpliteHdrFilter.dataSrcMACA= ddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.udpliteHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -1314,14 +1301,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.espHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.espHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -1339,14 +1326,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.ahHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.ahHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -1364,20 +1351,20 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.sctpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.sctpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 if (iptablesHandlePortData(fw, fwrule, vars, &rule->p.sctpHdrFilter.portData, directionIn) < 0) - goto cleanup; + return -1; break; =20 case VIR_NWFILTER_RULE_PROTOCOL_ICMP: @@ -1400,14 +1387,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.icmpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.icmpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 if (HAS_ENTRY_ITEM(&rule->p.icmpHdrFilter.dataICMPType)) { const char *parm; @@ -1416,8 +1403,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, =20 if (maySkipICMP) { virFirewallRemoveRule(fw, fwrule); - ret =3D 0; - goto cleanup; + return 0; } =20 if (rule->prtclType =3D=3D VIR_NWFILTER_RULE_PROTOCOL_ICMP) @@ -1428,7 +1414,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &rule->p.icmpHdrFilter.dataICMPType) < 0) - goto cleanup; + return -1; =20 if (ENTRY_WANT_NEG_SIGN(&rule->p.icmpHdrFilter.dataICMPType)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -1438,7 +1424,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, if (printDataType(vars, numberalt, sizeof(numberalt), &rule->p.icmpHdrFilter.dataICMPCode) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", number, numberalt); @@ -1461,14 +1447,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.igmpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.igmpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -1486,14 +1472,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.allHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.allHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -1501,7 +1487,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected protocol %d"), rule->prtclType); - goto cleanup; + return -1; } =20 if ((srcMacSkipped && @@ -1540,14 +1526,12 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, vars, &rule->p.allHdrFilter.ipHdr, directionIn) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-j", target, NULL); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2483,8 +2467,6 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, const char *ifname, virNWFilterVarCombIterPtr vars) { - int ret =3D -1; - if (virNWFilterRuleIsProtocolEthernet(rule)) { if (rule->tt =3D=3D VIR_NWFILTER_RULE_DIRECTION_OUT || rule->tt =3D=3D VIR_NWFILTER_RULE_DIRECTION_INOUT) { @@ -2495,7 +2477,7 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, ifname, vars, rule->tt =3D=3D VIR_NWFILTER_RU= LE_DIRECTION_INOUT) < 0) - goto cleanup; + return -1; } =20 if (rule->tt =3D=3D VIR_NWFILTER_RULE_DIRECTION_IN || @@ -2507,7 +2489,7 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, ifname, vars, false) < 0) - goto cleanup; + return -1; } } else { virFirewallLayer layer; @@ -2518,7 +2500,7 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, } else { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("unexpected protocol type")); - goto cleanup; + return -1; } =20 if (iptablesCreateRuleInstance(fw, @@ -2526,12 +2508,10 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, rule, ifname, vars) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list