From nobody Sat Nov 23 21:29:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1730974999; cv=none; d=zohomail.com; s=zohoarc; b=CdVxGZECOxiUrctlCTKD8c4iCWF15lsglulhQaFvNRvWaIm6Q+vn3nJy5WrSul114gqRfrDx2XrhW1oYFzBU1snhVF5tt5cuBBtmcCFy3NJ/5+MzXBLzTEdFFVbW5cMFWJs9rHSw2vgBKpb4QckNBWfaWGbhZ1CisyPhPgZw1Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730974999; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=7fSJvxsikWEVlSLTMUF4hTpiUDgpuukmhQKCTHqmb3A=; b=Q7Dslr6xqDFPZ+8VVREchjXB+mraVV6loORS0A5j4DKahyBwgqJ5z0x/+kj4N9jqAI0criPNnHUMOFANlD0ZmgqrAHdsr8FCl1iViJlWEAFUD1IylmiDLWC8EhuQ+OpMoamb32EbQkwFbdCXS6U2rh+IeX1Zt/u5G/CZCYd6S+M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730974999567267.47330451481946; Thu, 7 Nov 2024 02:23:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8zeY-00009P-3c; Thu, 07 Nov 2024 05:22:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8zeT-0008VW-9r for qemu-devel@nongnu.org; Thu, 07 Nov 2024 05:22:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8zeR-00020v-Jk for qemu-devel@nongnu.org; Thu, 07 Nov 2024 05:22:09 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-646-aU4ddEyLNj6cm-HccNGrfA-1; Thu, 07 Nov 2024 05:22:02 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0FD001955EBB for ; Thu, 7 Nov 2024 10:22:02 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.225.18]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F069D195E480; Thu, 7 Nov 2024 10:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730974926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7fSJvxsikWEVlSLTMUF4hTpiUDgpuukmhQKCTHqmb3A=; b=FmumR6aUc711sh2TnBJHIYr1Y5iMQdKtmkQRaJM5PpT6DADU8v9ZBxt32RZMxTjzIBESbg B1BQ0JQNOMYHdUDczjO3otNQ3atUUTUzHjV0YHFoJybTl+EEcNGuwCxB3L4zNDxScT1vlM Q5A6CJeWVcgeqFVkgRj839d9bZQpUDE= X-MC-Unique: aU4ddEyLNj6cm-HccNGrfA-1 X-Mimecast-MFC-AGG-ID: aU4ddEyLNj6cm-HccNGrfA From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Konstantin Kostiuk Subject: [PATCH v6 1/3] qemu-ga: Add 'Null' check and Redefine 'route' Date: Thu, 7 Nov 2024 12:21:53 +0200 Message-ID: <20241107102155.57573-2-kkostiuk@redhat.com> In-Reply-To: <20241107102155.57573-1-kkostiuk@redhat.com> References: <20241107102155.57573-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kkostiuk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1730975001305116600 sscanf return values are checked and add 'Null' check for mandatory parameters. And merged redundant route and networkroute variables. Signed-off-by: Dehan Meng Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Konstantin Kostiuk Signed-off-by: Konstantin Kostiuk --- qga/commands-linux.c | 83 +++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 9b1746b24f..eaf53e1c17 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2102,7 +2102,9 @@ static char *hexToIPAddress(const void *hexValue, int= is_ipv6) int i; for (i =3D 0; i < 16; i++) { - sscanf(&hexStr[i * 2], "%02hhx", &in6.s6_addr[i]); + if (sscanf(&hex_str[i * 2], "%02hhx", &in6.s6_addr[i]) !=3D 1)= { + return NULL; + } } inet_ntop(AF_INET6, &in6, addr, INET6_ADDRSTRLEN); @@ -2144,9 +2146,9 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **errp) firstLine =3D 0; continue; } - GuestNetworkRoute *route =3D NULL; - GuestNetworkRoute *networkroute; char Iface[IFNAMSIZ]; + g_autoptr(GuestNetworkRoute) route =3D g_new0(GuestNetworkRout= e, 1); + if (is_ipv6) { char Destination[33], Source[33], NextHop[33]; int DesPrefixlen, SrcPrefixlen, Metric, RefCnt, Use, Flags; @@ -2159,26 +2161,27 @@ GuestNetworkRouteList *qmp_guest_network_get_route(= Error **errp) continue; } - route =3D g_new0(GuestNetworkRoute, 1); - networkroute =3D route; - networkroute->iface =3D g_strdup(Iface); - networkroute->destination =3D hexToIPAddress(Destination, = 1); - networkroute->metric =3D Metric; - networkroute->source =3D hexToIPAddress(Source, 1); - networkroute->desprefixlen =3D g_strdup_printf( + route->iface =3D g_strdup(Iface); + route->destination =3D hexToIPAddress(Destination, 1); + if (route->destination =3D=3D NULL) { + continue; + } + route->metric =3D Metric; + route->source =3D hexToIPAddress(Source, 1); + route->desprefixlen =3D g_strdup_printf( "%d", DesPrefixlen ); - networkroute->srcprefixlen =3D g_strdup_printf( + route->srcprefixlen =3D g_strdup_printf( "%d", SrcPrefixlen ); - networkroute->nexthop =3D hexToIPAddress(NextHop, 1); - networkroute->has_flags =3D true; - networkroute->flags =3D Flags; - networkroute->has_refcnt =3D true; - networkroute->refcnt =3D RefCnt; - networkroute->has_use =3D true; - networkroute->use =3D Use; - networkroute->version =3D 6; + route->nexthop =3D hexToIPAddress(NextHop, 1); + route->has_flags =3D true; + route->flags =3D Flags; + route->has_refcnt =3D true; + route->refcnt =3D RefCnt; + route->has_use =3D true; + route->use =3D Use; + route->version =3D 6; } else { unsigned int Destination, Gateway, Mask, Flags; int RefCnt, Use, Metric, MTU, Window, IRTT; @@ -2190,29 +2193,31 @@ GuestNetworkRouteList *qmp_guest_network_get_route(= Error **errp) continue; } - route =3D g_new0(GuestNetworkRoute, 1); - networkroute =3D route; - networkroute->iface =3D g_strdup(Iface); - networkroute->destination =3D hexToIPAddress(&Destination,= 0); - networkroute->gateway =3D hexToIPAddress(&Gateway, 0); - networkroute->mask =3D hexToIPAddress(&Mask, 0); - networkroute->metric =3D Metric; - networkroute->has_flags =3D true; - networkroute->flags =3D Flags; - networkroute->has_refcnt =3D true; - networkroute->refcnt =3D RefCnt; - networkroute->has_use =3D true; - networkroute->use =3D Use; - networkroute->has_mtu =3D true; - networkroute->mtu =3D MTU; - networkroute->has_window =3D true; - networkroute->window =3D Window; - networkroute->has_irtt =3D true; - networkroute->irtt =3D IRTT; - networkroute->version =3D 4; + route->iface =3D g_strdup(Iface); + route->destination =3D hexToIPAddress(&Destination, 0); + if (route->destination =3D=3D NULL) { + continue; + } + route->gateway =3D hexToIPAddress(&Gateway, 0); + route->mask =3D hexToIPAddress(&Mask, 0); + route->metric =3D Metric; + route->has_flags =3D true; + route->flags =3D Flags; + route->has_refcnt =3D true; + route->refcnt =3D RefCnt; + route->has_use =3D true; + route->use =3D Use; + route->has_mtu =3D true; + route->mtu =3D MTU; + route->has_window =3D true; + route->window =3D Window; + route->has_irtt =3D true; + route->irtt =3D IRTT; + route->version =3D 4; } QAPI_LIST_APPEND(tail, route); + route =3D NULL; } free(line); -- 2.47.0 From nobody Sat Nov 23 21:29:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1730974979; cv=none; d=zohomail.com; s=zohoarc; b=IhxE9RqI/29Ehvbb6Y6ki78wZ1JNlBDw85vLah+obslvKKPSeVoqIJXbPDBkKfy/2SqOoZ6f9m6KJV8zvpanDRJlyEsEbgO3Y3P1ST7V0M5+WB0cuUZupIypqpCpixuyXRA6OG1wBg21qZx3lZZfqfkZ0SjlQXyOLj1a+dJv+9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730974979; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=5flCr5Yitvtq5KdIzKrhMAj2zO56XO5rvY48gjgNi3c=; b=U6HRcQvld4nI5lTZD7otXf1W1qioJ2C5hBb0IYOMM/RtKVSlL63yQ2Ykgqd1/VqlbozbRwpPEfSG3HCIm00SDKXmwrI/kZbWSEiIMc+Q/gpJNzxyXcJTNL3TXJl9xxjVjbImQkw93mQO5SYYpyiCtSQQHCaAIPMxtsHCl3GdXjc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730974979590562.662254823231; Thu, 7 Nov 2024 02:22:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8zee-0000CE-0L; Thu, 07 Nov 2024 05:22:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8zeT-0008VZ-Jk for qemu-devel@nongnu.org; Thu, 07 Nov 2024 05:22:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8zeR-000218-L4 for qemu-devel@nongnu.org; Thu, 07 Nov 2024 05:22:09 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-624-TaqHguGYPey-wfj8PfxlWQ-1; Thu, 07 Nov 2024 05:22:05 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 909411955F2B for ; Thu, 7 Nov 2024 10:22:04 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.225.18]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7E581195E480; Thu, 7 Nov 2024 10:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730974927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5flCr5Yitvtq5KdIzKrhMAj2zO56XO5rvY48gjgNi3c=; b=bnOQbYygF5TgPWK4QeHPpi1+PTfYNR80DyS5B7EEuOqnpI9xFt633Znwe5TpMiHYG9lzdi l4kZEBQ1WFUedWtbd1YWFc6M6KWaXBMvUGoi6d30fpfs/4VuZYytBBtH2ZmH3cE2ZZvZvy U2uX8R29vN6O/YM+8rkBVaaX5aQVfFQ= X-MC-Unique: TaqHguGYPey-wfj8PfxlWQ-1 X-Mimecast-MFC-AGG-ID: TaqHguGYPey-wfj8PfxlWQ From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Konstantin Kostiuk Subject: [PATCH v6 2/3] qemu-ga: Optimize var declaration and definition Date: Thu, 7 Nov 2024 12:21:54 +0200 Message-ID: <20241107102155.57573-3-kkostiuk@redhat.com> In-Reply-To: <20241107102155.57573-1-kkostiuk@redhat.com> References: <20241107102155.57573-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kkostiuk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1730974981330116600 Variable declarations moved to the beginning of blocks Followed the coding style of using snake_case for variable names. Proper initialization of param 'size_t n' to '0' for Signed-off-by: Dehan Meng Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Konstantin Kostiuk Signed-off-by: Konstantin Kostiuk --- qga/commands-linux.c | 92 ++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 50 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index eaf53e1c17..b0704ad423 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2093,12 +2093,12 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **e= rrp) return head; } -static char *hexToIPAddress(const void *hexValue, int is_ipv6) +static char *hex_to_ip_address(const void *hex_value, int is_ipv6) { if (is_ipv6) { char addr[INET6_ADDRSTRLEN]; struct in6_addr in6; - const char *hexStr =3D (const char *)hexValue; + const char *hex_str =3D (const char *)hex_value; int i; for (i =3D 0; i < 16; i++) { @@ -2110,11 +2110,11 @@ static char *hexToIPAddress(const void *hexValue, i= nt is_ipv6) return g_strdup(addr); } else { - unsigned int hexInt =3D *(unsigned int *)hexValue; - unsigned int byte1 =3D (hexInt >> 24) & 0xFF; - unsigned int byte2 =3D (hexInt >> 16) & 0xFF; - unsigned int byte3 =3D (hexInt >> 8) & 0xFF; - unsigned int byte4 =3D hexInt & 0xFF; + unsigned int hex_int =3D *(unsigned int *)hex_value; + unsigned int byte1 =3D (hex_int >> 24) & 0xFF; + unsigned int byte2 =3D (hex_int >> 16) & 0xFF; + unsigned int byte3 =3D (hex_int >> 8) & 0xFF; + unsigned int byte4 =3D hex_int & 0xFF; return g_strdup_printf("%u.%u.%u.%u", byte4, byte3, byte2, byte1); } @@ -2123,20 +2123,21 @@ static char *hexToIPAddress(const void *hexValue, i= nt is_ipv6) GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp) { GuestNetworkRouteList *head =3D NULL, **tail =3D &head; - const char *routeFiles[] =3D {"/proc/net/route", "/proc/net/ipv6_route= "}; + const char *route_files[] =3D {"/proc/net/route", "/proc/net/ipv6_rout= e"}; FILE *fp; - size_t n; + size_t n =3D 0; char *line =3D NULL; int firstLine; int is_ipv6; int i; + char iface[IFNAMSIZ]; for (i =3D 0; i < 2; i++) { firstLine =3D 1; is_ipv6 =3D (i =3D=3D 1); - fp =3D fopen(routeFiles[i], "r"); + fp =3D fopen(route_files[i], "r"); if (fp =3D=3D NULL) { - error_setg_errno(errp, errno, "open(\"%s\")", routeFiles[i]); + error_setg_errno(errp, errno, "open(\"%s\")", route_files[i]); free(line); continue; } @@ -2146,73 +2147,64 @@ GuestNetworkRouteList *qmp_guest_network_get_route(= Error **errp) firstLine =3D 0; continue; } - char Iface[IFNAMSIZ]; g_autoptr(GuestNetworkRoute) route =3D g_new0(GuestNetworkRout= e, 1); if (is_ipv6) { - char Destination[33], Source[33], NextHop[33]; - int DesPrefixlen, SrcPrefixlen, Metric, RefCnt, Use, Flags; - - /* Parse the line and extract the values */ + char destination[33], source[33], next_hop[33]; + int des_prefixlen, src_prefixlen, metric, refcnt, use, fla= gs; if (sscanf(line, "%32s %x %32s %x %32s %x %x %x %x %s", - Destination, &DesPrefixlen, Source, - &SrcPrefixlen, NextHop, &Metric, &RefCnt, - &Use, &Flags, Iface) !=3D 10) { + destination, &des_prefixlen, source, + &src_prefixlen, next_hop, &metric, &refcnt, + &use, &flags, iface) !=3D 10) { continue; } - route->iface =3D g_strdup(Iface); - route->destination =3D hexToIPAddress(Destination, 1); + route->destination =3D hex_to_ip_address(destination, 1); if (route->destination =3D=3D NULL) { continue; } - route->metric =3D Metric; - route->source =3D hexToIPAddress(Source, 1); - route->desprefixlen =3D g_strdup_printf( - "%d", DesPrefixlen - ); - route->srcprefixlen =3D g_strdup_printf( - "%d", SrcPrefixlen - ); - route->nexthop =3D hexToIPAddress(NextHop, 1); + route->iface =3D g_strdup(iface); + route->source =3D hex_to_ip_address(source, 1); + route->nexthop =3D hex_to_ip_address(next_hop, 1); + route->desprefixlen =3D g_strdup_printf("%d", des_prefixle= n); + route->srcprefixlen =3D g_strdup_printf("%d", src_prefixle= n); + route->metric =3D metric; route->has_flags =3D true; - route->flags =3D Flags; + route->flags =3D flags; route->has_refcnt =3D true; - route->refcnt =3D RefCnt; + route->refcnt =3D refcnt; route->has_use =3D true; - route->use =3D Use; + route->use =3D use; route->version =3D 6; } else { - unsigned int Destination, Gateway, Mask, Flags; - int RefCnt, Use, Metric, MTU, Window, IRTT; - - /* Parse the line and extract the values */ + unsigned int destination, gateway, mask, flags; + int refcnt, use, metric, mtu, window, irtt; if (sscanf(line, "%s %X %X %x %d %d %d %X %d %d %d", - Iface, &Destination, &Gateway, &Flags, &RefCnt, - &Use, &Metric, &Mask, &MTU, &Window, &IRTT) != =3D 11) { + iface, &destination, &gateway, &flags, &refcnt, + &use, &metric, &mask, &mtu, &window, &irtt) != =3D 11) { continue; } - route->iface =3D g_strdup(Iface); - route->destination =3D hexToIPAddress(&Destination, 0); + route->destination =3D hex_to_ip_address(&destination, 0); if (route->destination =3D=3D NULL) { continue; } - route->gateway =3D hexToIPAddress(&Gateway, 0); - route->mask =3D hexToIPAddress(&Mask, 0); - route->metric =3D Metric; + route->iface =3D g_strdup(iface); + route->gateway =3D hex_to_ip_address(&gateway, 0); + route->mask =3D hex_to_ip_address(&mask, 0); + route->metric =3D metric; route->has_flags =3D true; - route->flags =3D Flags; + route->flags =3D flags; route->has_refcnt =3D true; - route->refcnt =3D RefCnt; + route->refcnt =3D refcnt; route->has_use =3D true; - route->use =3D Use; + route->use =3D use; route->has_mtu =3D true; - route->mtu =3D MTU; + route->mtu =3D mtu; route->has_window =3D true; - route->window =3D Window; + route->window =3D window; route->has_irtt =3D true; - route->irtt =3D IRTT; + route->irtt =3D irtt; route->version =3D 4; } -- 2.47.0 From nobody Sat Nov 23 21:29:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1730975030; cv=none; d=zohomail.com; s=zohoarc; b=X0E0MlX1zPx8JR00WKe1kk2s5qyzUUsJb5RRC5Si04p5opH84rMIoRKwZvsbKUliO0egSIPA0xqjhxKeC+Cj/qFQwypNE7cfSC0QXCYvKwuqNw8kTQZbZIJN9SHn4jpYNCbsXs3jE76codVdWkzejOqGeiZX7yIlmI/QUgF1GXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730975030; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Kn9u8q6CxyfNjPwUQNoGYpfN9gozJFGwJPgliDSHkHc=; b=KHM0UmWaGYJ+4BeR7SuI74z+mrkaPjz8crWY9Ut8ZXoEwwbjuW+f/M8g5pySpjld/5w4QZpESWoQTFUzdlud28MJSmD4pYDPnueVGirO/+7LS3Y7uB7COy0mnz318/ZGAMJubP6A9E4rjQmZGbzbxeurOJkHgWx2hbxZZtlMdGI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730975030658712.4595456352743; Thu, 7 Nov 2024 02:23:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8zeb-0000BG-Tt; Thu, 07 Nov 2024 05:22:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8zeV-0008WM-20 for qemu-devel@nongnu.org; Thu, 07 Nov 2024 05:22:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8zeT-00021L-OW for qemu-devel@nongnu.org; Thu, 07 Nov 2024 05:22:10 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-CL-c4fVkPMmlVShgZgmMIw-1; Thu, 07 Nov 2024 05:22:07 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2D4331955F3B for ; Thu, 7 Nov 2024 10:22:06 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.225.18]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 18C67195E481; Thu, 7 Nov 2024 10:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730974928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kn9u8q6CxyfNjPwUQNoGYpfN9gozJFGwJPgliDSHkHc=; b=TKGEE2mQR/Vnq5n44vqPntUNqSIu4H930sftE1V6ihgj21sCaag+zr2jhhS5/pM5VpKUSg +QwDeWZ5SZ0VeIS1ckC4pz1zgC8t50lxKxzKJyzCnPcEfXsJ49YVJ1eKeVLNfsGeftYa20 /yY7NuODQ/yChOzmhgPhl+ErHcahpiI= X-MC-Unique: CL-c4fVkPMmlVShgZgmMIw-1 X-Mimecast-MFC-AGG-ID: CL-c4fVkPMmlVShgZgmMIw From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Konstantin Kostiuk Subject: [PATCH v6 3/3] qemu-ga: Avoiding freeing line prematurely Date: Thu, 7 Nov 2024 12:21:55 +0200 Message-ID: <20241107102155.57573-4-kkostiuk@redhat.com> In-Reply-To: <20241107102155.57573-1-kkostiuk@redhat.com> References: <20241107102155.57573-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kkostiuk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1730975031326116600 It's now only freed at the end of the function. Signed-off-by: Dehan Meng Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Konstantin Kostiuk Signed-off-by: Konstantin Kostiuk --- qga/commands-linux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index b0704ad423..cf077eb03d 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2138,7 +2138,6 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **errp) fp =3D fopen(route_files[i], "r"); if (fp =3D=3D NULL) { error_setg_errno(errp, errno, "open(\"%s\")", route_files[i]); - free(line); continue; } @@ -2212,9 +2211,9 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **errp) route =3D NULL; } - free(line); fclose(fp); } + free(line); return head; } -- 2.47.0