From nobody Mon Feb 9 15:08:22 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 1533714241783570.2305455710685; Wed, 8 Aug 2018 00:44:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A81F530E6864; Wed, 8 Aug 2018 07:43:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7155B1891B; Wed, 8 Aug 2018 07:43: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 0F45418037FF; Wed, 8 Aug 2018 07:43:59 +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 w787hvwx005777 for ; Wed, 8 Aug 2018 03:43:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id E2A393819A; Wed, 8 Aug 2018 07:43:57 +0000 (UTC) Received: from mx1.redhat.com (ext-mx20.extmail.prod.ext.phx2.redhat.com [10.5.110.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D9DD438194 for ; Wed, 8 Aug 2018 07:43:48 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) (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 A24A33081244 for ; Wed, 8 Aug 2018 07:43:47 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id a11-v6so688186pgw.6 for ; Wed, 08 Aug 2018 00:43:47 -0700 (PDT) Received: from centos.localdomain ([42.106.0.165]) by smtp.gmail.com with ESMTPSA id 9-v6sm9617719pfv.53.2018.08.08.00.43.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Aug 2018 00:43:46 -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=Nfv+8bIZn5BxRxi4achS9n/DhdGVuNEon0586fZHaos=; b=fSlfAKMPE/+rCPnQ8eqoRZLadzMzzxaOuZsyLZ1RMV+JbY37VIxgNtj0lWEMgwFl7b 5QHz+U7egX+rqywk5y2pop2RB+BDQKThgHzwdVpVaWkicjuhUbHrci0d095nYyGIuD9p ki2ozJoPRt5jP0C0Te29FLtAa5bT1vdtqB+LrjQFeT5rfCAo0mK/qolM6kXF0EZ70jgk NNFEPp4JnOr4LG/q2+FTw5ejMoxwos4D+d+Cqax8kuBJ5BUagJsTQv7ALrvheCcUMyLB P0423u4UwPOn5dIB9376nqku0gLPbY7ckNnmrbeKiH4dSG+so3eBeJPry92AOGV2VH2w cbAw== 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=Nfv+8bIZn5BxRxi4achS9n/DhdGVuNEon0586fZHaos=; b=Ag4kmkgwREgaSGYUDP/qUp244sELBqpRZ2sBCnYucGjwsm37T+x5T4UbHng1Xd6CTC RqAgM/z76r+TWRvRASRGlJEN4wJ9Aot1/c+fnjXbAuDGnNEOp+VTEu7XW7Qy9S0Ayc/n lIALIxER9UL4hg8uCSwCgtiSAIk69o/2+PI3txOm7lpZz21rbzkoVc5id6ntUyTA4MUe R2u35JCUcU0VvwOqfEezZuV6DHGVkkIbQ/OkslXQHQoh1cLTBg0onU7oe0mjnY+zplHU PaGmY9JqR2odON+GqzKgw4bDOY3Y54ewFzxjw2iDCvTmRu4tjm5CO/s1vmcDVyu7DI/C 0H5g== X-Gm-Message-State: AOUpUlFhPuOauuMNKSv6Mh5ParWouiamDD5z1o2h8ug4kKJvIOYxv+B5 aEWcAAo549F365PnX0TFEHIhN/pT X-Google-Smtp-Source: AA+uWPzSzxmOLXhxi8ewoZFR5iSMPMluEsHmv8HdIa2gef09O0wle6qmEcB56zGVX4T4f1u6bMDTEA== X-Received: by 2002:a63:9e0a:: with SMTP id s10-v6mr1444765pgd.326.1533714226879; Wed, 08 Aug 2018 00:43:46 -0700 (PDT) From: Sukrit Bhatnagar To: libvir-list@redhat.com Date: Mon, 6 Aug 2018 02:13:44 +0530 Message-Id: <1533501842-24503-18-git-send-email-skrtbhtngr@gmail.com> In-Reply-To: <1533501842-24503-1-git-send-email-skrtbhtngr@gmail.com> References: <1533501842-24503-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.49]); Wed, 08 Aug 2018 07:43:47 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 08 Aug 2018 07:43:47 +0000 (UTC) for IP:'209.85.215.194' DOMAIN:'mail-pg1-f194.google.com' HELO:'mail-pg1-f194.google.com' FROM:'skrtbhtngr@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.13 (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.194 mail-pg1-f194.google.com 209.85.215.194 mail-pg1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.49 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 17/35] util: netdevip: 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.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 08 Aug 2018 07:44:00 +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_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 --- src/util/virnetdevip.c | 97 ++++++++++++++++++----------------------------= ---- 1 file changed, 34 insertions(+), 63 deletions(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index fdb0b74..78c6dcf 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -171,11 +171,11 @@ virNetDevIPAddrAdd(const char *ifname, virSocketAddr *broadcast =3D NULL; int ret =3D -1; struct nl_msg *nlmsg =3D NULL; - struct nlmsghdr *resp =3D NULL; unsigned int recvbuflen; - char *ipStr =3D NULL; - char *peerStr =3D NULL; - char *bcastStr =3D NULL; + VIR_AUTOFREE(struct nlmsghdr *) resp =3D NULL; + VIR_AUTOFREE(char *) ipStr =3D NULL; + VIR_AUTOFREE(char *) peerStr =3D NULL; + VIR_AUTOFREE(char *) bcastStr =3D NULL; =20 ipStr =3D virSocketAddrFormat(addr); if (peer && VIR_SOCKET_ADDR_VALID(peer)) @@ -225,11 +225,7 @@ virNetDevIPAddrAdd(const char *ifname, =20 ret =3D 0; cleanup: - VIR_FREE(ipStr); - VIR_FREE(peerStr); - VIR_FREE(bcastStr); nlmsg_free(nlmsg); - VIR_FREE(resp); VIR_FREE(broadcast); return ret; } @@ -252,8 +248,8 @@ virNetDevIPAddrDel(const char *ifname, { int ret =3D -1; struct nl_msg *nlmsg =3D NULL; - struct nlmsghdr *resp =3D NULL; unsigned int recvbuflen; + VIR_AUTOFREE(struct nlmsghdr *) resp =3D NULL; =20 if (!(nlmsg =3D virNetDevCreateNetlinkAddressMessage(RTM_DELADDR, ifna= me, addr, prefix, @@ -273,7 +269,6 @@ virNetDevIPAddrDel(const char *ifname, ret =3D 0; cleanup: nlmsg_free(nlmsg); - VIR_FREE(resp); return ret; } =20 @@ -309,8 +304,8 @@ virNetDevIPRouteAdd(const char *ifname, int errCode; virSocketAddr defaultAddr; virSocketAddrPtr actualAddr; - char *toStr =3D NULL; - char *viaStr =3D NULL; + VIR_AUTOFREE(char *) toStr =3D NULL; + VIR_AUTOFREE(char *) viaStr =3D NULL; =20 actualAddr =3D addr; =20 @@ -383,8 +378,6 @@ virNetDevIPRouteAdd(const char *ifname, =20 ret =3D 0; cleanup: - VIR_FREE(toStr); - VIR_FREE(viaStr); nlmsg_free(nlmsg); return ret; =20 @@ -452,7 +445,6 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_= t count) { struct nl_msg *nlmsg =3D NULL; struct ifaddrmsg ifa; - struct nlmsghdr *resp =3D NULL; unsigned int recvbuflen; int ret =3D -1; bool dad =3D true; @@ -475,6 +467,8 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_= t count) =20 /* Periodically query netlink until DAD finishes on all known addresse= s. */ while (dad && time(NULL) < max_time) { + VIR_AUTOFREE(struct nlmsghdr *) resp =3D NULL; + if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, NETLINK_ROUTE, 0) < 0) goto cleanup; @@ -489,8 +483,6 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_= t count) dad =3D virNetDevIPParseDadStatus(resp, recvbuflen, addrs, count); if (dad) usleep(1000 * 10); - - VIR_FREE(resp); } /* Check timeout. */ if (dad) { @@ -502,7 +494,6 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_= t count) } =20 cleanup: - VIR_FREE(resp); nlmsg_free(nlmsg); return ret; } @@ -510,22 +501,18 @@ virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, siz= e_t count) static int virNetDevIPGetAcceptRA(const char *ifname) { - char *path =3D NULL; - char *buf =3D NULL; char *suffix; int accept_ra =3D -1; + VIR_AUTOFREE(char *) path =3D NULL; + VIR_AUTOFREE(char *) buf =3D NULL; =20 if (virAsprintf(&path, "/proc/sys/net/ipv6/conf/%s/accept_ra", ifname ? ifname : "all") < 0) - goto cleanup; + return -1; =20 if ((virFileReadAll(path, 512, &buf) < 0) || (virStrToLong_i(buf, &suffix, 10, &accept_ra) < 0)) - goto cleanup; - - cleanup: - VIR_FREE(path); - VIR_FREE(buf); + return accept_ra; =20 return accept_ra; } @@ -545,17 +532,16 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct n= lmsghdr *resp, struct rtmsg *rtmsg =3D NLMSG_DATA(resp); int accept_ra =3D -1; struct rtattr *rta; - char *ifname =3D NULL; struct virNetDevIPCheckIPv6ForwardingData *data =3D opaque; - int ret =3D 0; int len =3D RTM_PAYLOAD(resp); int oif =3D -1; size_t i; bool hasDevice; + VIR_AUTOFREE(char *) ifname =3D NULL; =20 /* Ignore messages other than route ones */ if (resp->nlmsg_type !=3D RTM_NEWROUTE) - return ret; + return 0; =20 /* Extract a device ID attribute */ VIR_WARNINGS_NO_CAST_ALIGN @@ -566,21 +552,20 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct n= lmsghdr *resp, =20 /* Should never happen: netlink message would be broken */ if (ifname) { - char *ifname2 =3D virNetDevGetName(oif); + VIR_AUTOFREE(char *) ifname2 =3D virNetDevGetName(oif); VIR_WARN("Single route has unexpected 2nd interface " "- '%s' and '%s'", ifname, ifname2); - VIR_FREE(ifname2); break; } =20 if (!(ifname =3D virNetDevGetName(oif))) - goto error; + return -1; } } =20 /* No need to do anything else for non RA routes */ if (rtmsg->rtm_protocol !=3D RTPROT_RA) - goto cleanup; + return 0; =20 data->hasRARoutes =3D true; =20 @@ -595,15 +580,9 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct nl= msghdr *resp, } if (accept_ra !=3D 2 && !hasDevice && VIR_APPEND_ELEMENT(data->devices, data->ndevices, ifname) < 0) - goto error; + return -1; =20 - cleanup: - VIR_FREE(ifname); - return ret; - - error: - ret =3D -1; - goto cleanup; + return 0; } =20 bool @@ -687,9 +666,11 @@ virNetDevIPAddrAdd(const char *ifname, unsigned int prefix) { virCommandPtr cmd =3D NULL; - char *addrstr =3D NULL, *bcaststr =3D NULL, *peerstr =3D NULL; virSocketAddr broadcast; int ret =3D -1; + 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; @@ -733,9 +714,6 @@ virNetDevIPAddrAdd(const char *ifname, =20 ret =3D 0; cleanup: - VIR_FREE(addrstr); - VIR_FREE(bcaststr); - VIR_FREE(peerstr); virCommandFree(cmd); return ret; } @@ -747,8 +725,8 @@ virNetDevIPAddrDel(const char *ifname, unsigned int prefix) { virCommandPtr cmd =3D NULL; - char *addrstr; int ret =3D -1; + VIR_AUTOFREE(char *) addrstr =3D NULL; =20 if (!(addrstr =3D virSocketAddrFormat(addr))) goto cleanup; @@ -773,7 +751,6 @@ virNetDevIPAddrDel(const char *ifname, =20 ret =3D 0; cleanup: - VIR_FREE(addrstr); virCommandFree(cmd); return ret; } @@ -786,9 +763,10 @@ virNetDevIPRouteAdd(const char *ifname, virSocketAddrPtr gateway, unsigned int metric) { - virCommandPtr cmd =3D NULL; - char *addrstr =3D NULL, *gatewaystr =3D NULL; int ret =3D -1; + virCommandPtr cmd =3D NULL; + VIR_AUTOFREE(char *) addrstr =3D NULL; + VIR_AUTOFREE(char *) gatewaystr =3D NULL; =20 if (!(addrstr =3D virSocketAddrFormat(addr))) goto cleanup; @@ -806,8 +784,6 @@ virNetDevIPRouteAdd(const char *ifname, =20 ret =3D 0; cleanup: - VIR_FREE(addrstr); - VIR_FREE(gatewaystr); virCommandFree(cmd); return ret; } @@ -1083,7 +1059,6 @@ int virNetDevIPInfoAddToDev(const char *ifname, virNetDevIPInfo const *ipInfo) { - int ret =3D -1; size_t i; int prefix; =20 @@ -1093,16 +1068,15 @@ virNetDevIPInfoAddToDev(const char *ifname, =20 if ((prefix =3D virSocketAddrGetIPPrefix(&ip->address, NULL, ip->prefix)) < 0) { - char *ipStr =3D virSocketAddrFormat(&ip->address); + VIR_AUTOFREE(char *) ipStr =3D virSocketAddrFormat(&ip->addres= s); =20 virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to determine prefix for IP address '%= s'"), NULLSTR(ipStr)); - VIR_FREE(ipStr); - goto cleanup; + return -1; } if (virNetDevIPAddrAdd(ifname, &ip->address, &ip->peer, prefix) < = 0) - goto cleanup; + return -1; } =20 /* add all routes */ @@ -1110,23 +1084,20 @@ virNetDevIPInfoAddToDev(const char *ifname, virNetDevIPRoutePtr route =3D ipInfo->routes[i]; =20 if ((prefix =3D virNetDevIPRouteGetPrefix(route)) < 0) { - char *ipStr =3D virSocketAddrFormat(&route->address); + VIR_AUTOFREE(char *) ipStr =3D virSocketAddrFormat(&route->add= ress); =20 virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to determine prefix for route with de= stination '%s'"), NULLSTR(ipStr)); - VIR_FREE(ipStr); - goto cleanup; + return -1; } if (virNetDevIPRouteAdd(ifname, &route->address, prefix, &route->gateway, virNetDevIPRouteGetMetric(route)) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 void --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list