From nobody Wed Jul 16 12:26:29 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 153381800309857.78445154604128; Thu, 9 Aug 2018 05:33:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 781A7369BC; Thu, 9 Aug 2018 12:33:20 +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 45A96CDE07; Thu, 9 Aug 2018 12:33:20 +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 EA8814A46C; Thu, 9 Aug 2018 12:33:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w79CXBIm000492 for ; Thu, 9 Aug 2018 08:33:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id E54205E1D6; Thu, 9 Aug 2018 12:33:11 +0000 (UTC) Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D76F65E1CF for ; Thu, 9 Aug 2018 12:33:07 +0000 (UTC) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) (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 0E1B63082267 for ; Thu, 9 Aug 2018 12:33:06 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id f1-v6so2678633pgq.12 for ; Thu, 09 Aug 2018 05:33:06 -0700 (PDT) Received: from centos.localdomain ([49.33.163.55]) by smtp.gmail.com with ESMTPSA id j15-v6sm8649810pfn.52.2018.08.09.05.33.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 05:33:04 -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=h3IOao5c6H0XIAQvLPL3ON5AeL9M47iAv3jvzKkdQPs=; b=GTSYkWUyN/rws1r4+3tCELAh7e8fgh8kCMLJrb/ykC1vlcO76+keT0Wl99V+2ePYb7 lc0ntM0XPw6hVoCL1dQPwV5VzQUW5bzNv8Dfv6wGn8Nh8h/cibJyYOX3cOY81Dhrf0EM 6SHn4B+HQIk7eBw6UJBqaHsdGm3RrJz15hzMLql7qWv+6r4ErkrTdt9rpbuJmGDF7Amw EJnzeK7XLGGmYauJl9WhorVMMCJofrWhjXN7Ccp36oAJnXfH7djfYTFdsLGVZX+Z4RG1 AEgsqFnof7IgeivolTVLm/p7TJ3djtH42hjYrskje6Yv0vbBg7eVAZcM+0ary7hq2Q5y xNeg== 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=h3IOao5c6H0XIAQvLPL3ON5AeL9M47iAv3jvzKkdQPs=; b=cvw9UzcN2oesUj81hQlI2kBNymrFgdWHVETlYeaLIaT9fJlZ1zQOz0yvwGtFeH7Owu hTf7QhtOz4v+Ozug4r4Qj1Bao6SvHkGO4NgQ3d/1znSdXzcsJcb55EN7jsxguuxKuHBY gMZTUo1S4SJeW5f2/62FGTh4Hutmdl4XxBI0nCiUzFbRU6zdUo3JErQKCIVxWSlg1+et xK6aLVSouyILVZ+XAnCyqXGnru+z6Dccsf4zXV8fwdvRfUcikifF+CVhQN8aBp4jBjT1 3hbh3ekaByNJ85AY0+DPvUpa5rUuyjC4A6QAjxjVkSezmbjAuqPU0NnDbsE867qQXmJQ mgYA== X-Gm-Message-State: AOUpUlFSD/7RBBk01hN74bgRzdInNEGx1wJl1hQFebAOM93evGvajEgj WY0L7fpyYiZ0D05A1ytHFrqni2tS X-Google-Smtp-Source: AA+uWPxs14wM8W20FzTQqK1gZEzYxFaQdakIoSDu8W1swmcyhQFRJpXTjrWKhKvS6e/cgP6nezr6vA== X-Received: by 2002:a63:f414:: with SMTP id g20-v6mr1980847pgi.407.1533817985155; Thu, 09 Aug 2018 05:33:05 -0700 (PDT) From: Sukrit Bhatnagar To: libvir-list@redhat.com Date: Thu, 9 Aug 2018 09:42:17 +0530 Message-Id: <1533787939-28634-10-git-send-email-skrtbhtngr@gmail.com> In-Reply-To: <1533787939-28634-1-git-send-email-skrtbhtngr@gmail.com> References: <1533787939-28634-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.45]); Thu, 09 Aug 2018 12:33:06 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 09 Aug 2018 12:33:06 +0000 (UTC) for IP:'209.85.215.193' DOMAIN:'mail-pg1-f193.google.com' HELO:'mail-pg1-f193.google.com' FROM:'skrtbhtngr@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.973 (DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.215.193 mail-pg1-f193.google.com 209.85.215.193 mail-pg1-f193.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 09/11] util: netdevip: use VIR_AUTOPTR for aggregate 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.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 09 Aug 2018 12:33:21 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 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_AUTOPTR macro for declaring aggregate pointer variables, majority of the calls to *Free functions 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/virnetdevip.c | 130 +++++++++++++++++++--------------------------= ---- 1 file changed, 51 insertions(+), 79 deletions(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index c6d6175..4a38a54 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -168,10 +168,9 @@ virNetDevIPAddrAdd(const char *ifname, virSocketAddr *peer, unsigned int prefix) { - virSocketAddr *broadcast =3D NULL; - int ret =3D -1; - struct nl_msg *nlmsg =3D NULL; unsigned int recvbuflen; + VIR_AUTOPTR(virNlMsg) nlmsg =3D NULL; + VIR_AUTOPTR(virSocketAddr) broadcast =3D NULL; VIR_AUTOFREE(struct nlmsghdr *) resp =3D NULL; VIR_AUTOFREE(char *) ipStr =3D NULL; VIR_AUTOFREE(char *) peerStr =3D NULL; @@ -186,13 +185,13 @@ virNetDevIPAddrAdd(const char *ifname, !(peer && VIR_SOCKET_ADDR_VALID(peer))) { /* compute a broadcast address if this is IPv4 */ if (VIR_ALLOC(broadcast) < 0) - goto cleanup; + return -1; =20 if (virSocketAddrBroadcastByPrefix(addr, prefix, broadcast) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to determine broadcast address for '%s/%d= '"), - ipStr, prefix); - goto cleanup; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to determine broadcast address for '%= s/%d'"), + ipStr, prefix); + return -1; } bcastStr =3D virSocketAddrFormat(broadcast); } @@ -206,11 +205,11 @@ virNetDevIPAddrAdd(const char *ifname, if (!(nlmsg =3D virNetDevCreateNetlinkAddressMessage(RTM_NEWADDR, ifna= me, addr, prefix, broadcast, peer))) - goto cleanup; + return -1; =20 if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, NETLINK_ROUTE, 0) < 0) - goto cleanup; + return -1; =20 =20 if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { @@ -220,14 +219,10 @@ virNetDevIPAddrAdd(const char *ifname, peerStr ? " peer " : "", peerStr ? peerStr : "", bcastStr ? " bcast " : "", bcastStr ? bcastStr : "", ifname); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - nlmsg_free(nlmsg); - VIR_FREE(broadcast); - return ret; + return 0; } =20 =20 @@ -246,30 +241,26 @@ virNetDevIPAddrDel(const char *ifname, virSocketAddr *addr, unsigned int prefix) { - int ret =3D -1; - struct nl_msg *nlmsg =3D NULL; unsigned int recvbuflen; + VIR_AUTOPTR(virNlMsg) nlmsg =3D NULL; VIR_AUTOFREE(struct nlmsghdr *) resp =3D NULL; =20 if (!(nlmsg =3D virNetDevCreateNetlinkAddressMessage(RTM_DELADDR, ifna= me, addr, prefix, NULL, NULL))) - goto cleanup; + return -1; =20 if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, NETLINK_ROUTE, 0) < 0) - goto cleanup; + return -1; =20 if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Error removing IP address from %s"), ifname); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - nlmsg_free(nlmsg); - return ret; + return 0; } =20 =20 @@ -292,8 +283,6 @@ virNetDevIPRouteAdd(const char *ifname, virSocketAddrPtr gateway, unsigned int metric) { - int ret =3D -1; - struct nl_msg *nlmsg =3D NULL; struct nlmsghdr *resp =3D NULL; unsigned int recvbuflen; unsigned int ifindex; @@ -304,6 +293,7 @@ virNetDevIPRouteAdd(const char *ifname, int errCode; virSocketAddr defaultAddr; virSocketAddrPtr actualAddr; + VIR_AUTOPTR(virNlMsg) nlmsg =3D NULL; VIR_AUTOFREE(char *) toStr =3D NULL; VIR_AUTOFREE(char *) viaStr =3D NULL; =20 @@ -315,10 +305,10 @@ virNetDevIPRouteAdd(const char *ifname, int family =3D VIR_SOCKET_ADDR_FAMILY(gateway); if (family =3D=3D AF_INET) { if (virSocketAddrParseIPv4(&defaultAddr, VIR_SOCKET_ADDR_IPV4_= ALL) < 0) - goto cleanup; + return -1; } else { if (virSocketAddrParseIPv6(&defaultAddr, VIR_SOCKET_ADDR_IPV6_= ALL) < 0) - goto cleanup; + return -1; } =20 actualAddr =3D &defaultAddr; @@ -330,17 +320,17 @@ virNetDevIPRouteAdd(const char *ifname, =20 if (virNetDevGetIPAddressBinary(actualAddr, &addrData, &addrDataLen) <= 0 || virNetDevGetIPAddressBinary(gateway, &gatewayData, &addrDataLen) <= 0) - goto cleanup; + return -1; =20 /* Get the interface index */ if ((ifindex =3D if_nametoindex(ifname)) =3D=3D 0) - goto cleanup; + return -1; =20 if (!(nlmsg =3D nlmsg_alloc_simple(RTM_NEWROUTE, NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL))) { virReportOOMError(); - goto cleanup; + return -1; } =20 memset(&rtmsg, 0, sizeof(rtmsg)); @@ -369,22 +359,19 @@ virNetDevIPRouteAdd(const char *ifname, =20 if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, NETLINK_ROUTE, 0) < 0) - goto cleanup; + return -1; =20 if ((errCode =3D virNetlinkGetErrorCode(resp, recvbuflen)) < 0) { virReportSystemError(errCode, _("Error adding route to %s"), ifnam= e); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - nlmsg_free(nlmsg); - return ret; + return 0; =20 buffer_too_small: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("allocated netlink buffer is too small")); - goto cleanup; + return -1; } =20 =20 @@ -443,12 +430,11 @@ virNetDevIPParseDadStatus(struct nlmsghdr *nlh, int l= en, int virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count) { - struct nl_msg *nlmsg =3D NULL; struct ifaddrmsg ifa; unsigned int recvbuflen; - int ret =3D -1; bool dad =3D true; time_t max_time =3D time(NULL) + VIR_DAD_WAIT_TIMEOUT; + VIR_AUTOPTR(virNlMsg) nlmsg =3D NULL; =20 if (!(nlmsg =3D nlmsg_alloc_simple(RTM_GETADDR, NLM_F_REQUEST | NLM_F_DUMP))) { @@ -462,7 +448,7 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_= t count) if (nlmsg_append(nlmsg, &ifa, sizeof(ifa), NLMSG_ALIGNTO) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("allocated netlink buffer is too small")); - goto cleanup; + return -1; } =20 /* Periodically query netlink until DAD finishes on all known addresse= s. */ @@ -471,12 +457,12 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, siz= e_t count) =20 if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, NETLINK_ROUTE, 0) < 0) - goto cleanup; + return -1; =20 if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("error reading DAD state information")); - goto cleanup; + return -1; } =20 /* Parse response. */ @@ -490,21 +476,19 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, siz= e_t count) _("Duplicate Address Detection " "not finished in %d seconds"), VIR_DAD_WAIT_TIMEO= UT); } else { - ret =3D 0; + return 0; } =20 - cleanup: - nlmsg_free(nlmsg); - return ret; + return -1; } =20 static int virNetDevIPGetAcceptRA(const char *ifname) { + char *suffix; + int accept_ra =3D -1; VIR_AUTOFREE(char *) path =3D NULL; VIR_AUTOFREE(char *) buf =3D NULL; - char *suffix; - int accept_ra =3D -1; =20 if (virAsprintf(&path, "/proc/sys/net/ipv6/conf/%s/accept_ra", ifname ? ifname : "all") < 0) @@ -553,6 +537,7 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct nlm= sghdr *resp, /* Should never happen: netlink message would be broken */ if (ifname) { VIR_AUTOFREE(char *) ifname2 =3D virNetDevGetName(oif); + VIR_WARN("Single route has unexpected 2nd interface " "- '%s' and '%s'", ifname, ifname2); break; @@ -588,7 +573,6 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct nlm= sghdr *resp, bool virNetDevIPCheckIPv6Forwarding(void) { - struct nl_msg *nlmsg =3D NULL; bool valid =3D false; struct rtgenmsg genmsg; size_t i; @@ -597,6 +581,7 @@ virNetDevIPCheckIPv6Forwarding(void) .devices =3D NULL, .ndevices =3D 0 }; + VIR_AUTOPTR(virNlMsg) nlmsg =3D NULL; =20 =20 /* Prepare the request message */ @@ -650,7 +635,6 @@ virNetDevIPCheckIPv6Forwarding(void) } =20 cleanup: - nlmsg_free(nlmsg); for (i =3D 0; i < data.ndevices; i++) VIR_FREE(data.devices[i]); return valid; @@ -665,24 +649,23 @@ virNetDevIPAddrAdd(const char *ifname, virSocketAddr *peer, unsigned int prefix) { - virCommandPtr cmd =3D NULL; virSocketAddr broadcast; - int ret =3D -1; + VIR_AUTOPTR(virCommand) cmd =3D NULL; VIR_AUTOFREE(char *) addrstr =3D NULL; VIR_AUTOFREE(char *) bcaststr =3D NULL; VIR_AUTOFREE(char *) peerstr =3D NULL; =20 if (!(addrstr =3D virSocketAddrFormat(addr))) - goto cleanup; + return -1; =20 if (peer && VIR_SOCKET_ADDR_VALID(peer) && !(peerstr =3D virSocketAddr= Format(peer))) - goto cleanup; + return -1; =20 /* format up a broadcast address if this is IPv4 */ if (!peerstr && ((VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) && ((virSocketAddrBroadcastByPrefix(addr, prefix, &broadcast) < 0) || !(bcaststr =3D virSocketAddrFormat(&broadcast))))) { - goto cleanup; + return -1; } =20 # ifdef IFCONFIG_PATH @@ -710,12 +693,9 @@ virNetDevIPAddrAdd(const char *ifname, # endif =20 if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - virCommandFree(cmd); - return ret; + return 0; } =20 =20 @@ -724,12 +704,11 @@ virNetDevIPAddrDel(const char *ifname, virSocketAddr *addr, unsigned int prefix) { - virCommandPtr cmd =3D NULL; - int ret =3D -1; + VIR_AUTOPTR(virCommand) cmd =3D NULL; VIR_AUTOFREE(char *) addrstr =3D NULL; =20 if (!(addrstr =3D virSocketAddrFormat(addr))) - goto cleanup; + return -1; # ifdef IFCONFIG_PATH cmd =3D virCommandNew(IFCONFIG_PATH); virCommandAddArg(cmd, ifname); @@ -747,12 +726,9 @@ virNetDevIPAddrDel(const char *ifname, # endif =20 if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - virCommandFree(cmd); - return ret; + return 0; } =20 =20 @@ -763,15 +739,14 @@ virNetDevIPRouteAdd(const char *ifname, virSocketAddrPtr gateway, unsigned int metric) { - virCommandPtr cmd =3D NULL; - int ret =3D -1; + VIR_AUTOPTR(virCommand) cmd =3D NULL; VIR_AUTOFREE(char *) addrstr =3D NULL; VIR_AUTOFREE(char *) gatewaystr =3D NULL; =20 if (!(addrstr =3D virSocketAddrFormat(addr))) - goto cleanup; + return -1; if (!(gatewaystr =3D virSocketAddrFormat(gateway))) - goto cleanup; + return -1; cmd =3D virCommandNew(IP_PATH); virCommandAddArgList(cmd, "route", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); @@ -780,12 +755,9 @@ virNetDevIPRouteAdd(const char *ifname, virCommandAddArgFormat(cmd, "%u", metric); =20 if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - virCommandFree(cmd); - return ret; + return 0; } =20 =20 --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list