From nobody Sat Nov 23 20:58:45 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=1730882576; cv=none; d=zohomail.com; s=zohoarc; b=YroCvj3Dm+oLjfDHI41Kx3MGo/FZMGrcohEwvHgon/77LvzyVFMjaMYeBZw9Cop7I5AIu0LLFiDEp2vDEfN5u+ZHn5CIznvLY2vdFKxrVhzpmPynT4mwW/m9LBM+R47yvld12Tr1dp4f5YPv2F2JpWpl2cjUf4oboJeQ9j1Hzi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730882576; h=Content-Transfer-Encoding:Cc:Cc: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; bh=HaJWEOS2a9nzhPUG1M6thfJXd91QMcJRIuC7D1z82ds=; b=YvgLKi4SbeAAEL/RxVnXcQprsKr8ukjYNuZB9vgm3SuY6F1IjeVmOxhQOahSH5rlrIzFJj74zZp8ec8LRgkJimntqOlAoIpR/LkIbtmDf6i6B6cr8gmrLlEbny/71V9Iq0kGy2cvidZQvTGNeDaE5r/708MGar2wFcBynaUDnuo= 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 1730882576249827.0226951720563; Wed, 6 Nov 2024 00:42:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8bc5-0005Uy-UF; Wed, 06 Nov 2024 03:42:06 -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 1t8bc0-0005UG-K1 for qemu-devel@nongnu.org; Wed, 06 Nov 2024 03:42:01 -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 1t8bbv-0007TY-1Q for qemu-devel@nongnu.org; Wed, 06 Nov 2024 03:41:56 -0500 Received: from mx-prod-mc-04.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-572-tV2k78k_NcGCMcvC5u9s8w-1; Wed, 06 Nov 2024 03:41:51 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1609D19560B6; Wed, 6 Nov 2024 08:41:50 +0000 (UTC) Received: from fedora.nay.redhat.com (unknown [10.66.57.68]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AF75D1955F2F; Wed, 6 Nov 2024 08:41:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730882514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HaJWEOS2a9nzhPUG1M6thfJXd91QMcJRIuC7D1z82ds=; b=Ivq1tYkDVa93ywVu/yTZbXsWny8d6YjyChuUenr+1wJMJofoenJgMKqO9UQ1R9+5Q3y1iy leRE2gbDYC58rwN60mppWG1D9XlhYV91mu9djKltYSYAJlMxLVFFAvssoORWlYHJCgMhbA 5kBlpXU4gO6dFrQW7V5BZE28/whsVQ0= X-MC-Unique: tV2k78k_NcGCMcvC5u9s8w-1 X-Mimecast-MFC-AGG-ID: tV2k78k_NcGCMcvC5u9s8w From: Dehan Meng To: qemu-devel@nongnu.org Cc: demeng@redhat.com, kkostiuk@redhat.com, michael.roth@amd.com, peter.maydell@linaro.org, berrange@redhat.com Subject: [PATCH v5 1/3] qemu-ga: Add 'Null' check and Redefine 'route' Date: Wed, 6 Nov 2024 16:41:32 +0800 Message-Id: <20241106084134.1133061-2-demeng@redhat.com> In-Reply-To: <20241106084134.1133061-1-demeng@redhat.com> References: <20241106084134.1133061-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=demeng@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: 1730882577184116600 Content-Type: text/plain; charset="utf-8" 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 --- qga/commands-linux.c | 86 +++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 51d5e3d927..495de74b31 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2103,7 +2103,9 @@ static char *hexToIPAddress(const void *hexValue, int= is_ipv6) int i; =20 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); =20 @@ -2160,26 +2162,25 @@ GuestNetworkRouteList *qmp_guest_network_get_route(= Error **errp) continue; } =20 - 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( - "%d", DesPrefixlen - ); - networkroute->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; + g_autoptr(GuestNetworkRoute) route =3D g_new0(GuestNetwork= Route, 1); + + route->destination =3D hex_to_ip_address(destination, 1); + route->iface =3D g_strdup(iface); + if (route->destination =3D=3D NULL) { + continue; + } + 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->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; @@ -2191,26 +2192,29 @@ GuestNetworkRouteList *qmp_guest_network_get_route(= Error **errp) continue; } =20 - 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; + g_autoptr(GuestNetworkRoute) route =3D g_new0(GuestNetwork= Route, 1); + + route->destination =3D hex_to_ip_address(destination, 1); + route->iface =3D g_strdup(iface); + if (route->destination =3D=3D NULL) { + continue; + } + 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->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; } =20 QAPI_LIST_APPEND(tail, route); --=20 2.40.1 From nobody Sat Nov 23 20:58:45 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=1730882576; cv=none; d=zohomail.com; s=zohoarc; b=a6gM18k7Ba0juJPpbVM7vp8DMrYv/uyipqZfi2xBxyBaMZfaI5zJ4knoicfxmOA+ATtHVD/WGzKO8ooSByPRdUFdcfcvvO6Cd87D29pkUoet1oYaiN9hRQAytTTRg9nrsPhpRCAfnP1ZPgcivxJNAp3vAieAU2P4EVfJHYI3WOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730882576; h=Content-Transfer-Encoding:Cc:Cc: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; bh=GVXTpK/mspqiOPCZlz7gscB3TB7EwyQVYzQzxIcTB30=; b=oCY/00UzMIoxbwCO5Nhp8osjLOn5TpBr6bpsdF/e57DofqUqIaPHYDTc0tx+HfBoWVwhVZacytHNnpnJguZFhtDCM91ODhO1tEMrbMRuP9T2dx+9iwwBGmBJRh6GiAf7b1yCyVXurIWInkViNLpqDOn2Ux0q82U2P+LnWn0MVrs= 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 1730882576175896.9172817894379; Wed, 6 Nov 2024 00:42:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8bc7-0005Uz-46; Wed, 06 Nov 2024 03:42:07 -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 1t8bc2-0005Uj-R4 for qemu-devel@nongnu.org; Wed, 06 Nov 2024 03:42:03 -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 1t8bc1-0007U2-4i for qemu-devel@nongnu.org; Wed, 06 Nov 2024 03:42:02 -0500 Received: from mx-prod-mc-02.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-434-FWSKpz0KNH21jCUCnzOs3w-1; Wed, 06 Nov 2024 03:41:55 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 557941955F43; Wed, 6 Nov 2024 08:41:54 +0000 (UTC) Received: from fedora.nay.redhat.com (unknown [10.66.57.68]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D6E541955F40; Wed, 6 Nov 2024 08:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730882520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GVXTpK/mspqiOPCZlz7gscB3TB7EwyQVYzQzxIcTB30=; b=HHxGHkTJTtw8TohhL2YxfjsXP6ibMlDVWlI3uhzEqiwitDWG86A5SzbKYWcpql/PbqvbKL brK+b/ld1/5pWl2AqqTs9UwvJo5lGhcRpGSqo+tJWt2VZ7OPlOGD8vlLawz6hKmrILeu49 lj0RqNqzIZE7W6ewV0bdgqdC/FN0hnc= X-MC-Unique: FWSKpz0KNH21jCUCnzOs3w-1 X-Mimecast-MFC-AGG-ID: FWSKpz0KNH21jCUCnzOs3w From: Dehan Meng To: qemu-devel@nongnu.org Cc: demeng@redhat.com, kkostiuk@redhat.com, michael.roth@amd.com, peter.maydell@linaro.org, berrange@redhat.com Subject: [PATCH v5 2/3] qemu-ga: Optimize var declaration and definition Date: Wed, 6 Nov 2024 16:41:33 +0800 Message-Id: <20241106084134.1133061-3-demeng@redhat.com> In-Reply-To: <20241106084134.1133061-1-demeng@redhat.com> References: <20241106084134.1133061-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=demeng@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: 1730882577166116600 Content-Type: text/plain; charset="utf-8" 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 --- qga/commands-linux.c | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 495de74b31..55c35bfc8f 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2094,12 +2094,12 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **e= rrp) return head; } =20 -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; =20 for (i =3D 0; i < 16; i++) { @@ -2111,11 +2111,11 @@ static char *hexToIPAddress(const void *hexValue, i= nt is_ipv6) =20 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; =20 return g_strdup_printf("%u.%u.%u.%u", byte4, byte3, byte2, byte1); } @@ -2126,11 +2126,12 @@ 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= "}; FILE *fp; - size_t n; + size_t n =3D 0; char *line =3D NULL; int firstLine; int is_ipv6; int i; + char iface[IFNAMSIZ]; =20 for (i =3D 0; i < 2; i++) { firstLine =3D 1; @@ -2147,18 +2148,14 @@ GuestNetworkRouteList *qmp_guest_network_get_route(= Error **errp) firstLine =3D 0; continue; } - GuestNetworkRoute *route =3D NULL; - GuestNetworkRoute *networkroute; - char Iface[IFNAMSIZ]; + =20 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; } =20 @@ -2182,13 +2179,11 @@ GuestNetworkRouteList *qmp_guest_network_get_route(= Error **errp) 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; } =20 --=20 2.40.1 From nobody Sat Nov 23 20:58:45 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=1730882540; cv=none; d=zohomail.com; s=zohoarc; b=SIh6c3RIv6v/eMTN2KKwMbquGtTKG88pl1MokwU2Ds5EME2lkiOaHM9e0GqoY037t33X5DKI7KELwrBPHSAeSlWI4c6qw1PsUa4MwLvmcW9NLOW8dOymbnh+v1zyhcyyBsyBKc8JBgC0KNVSN7asGWMfTqOqSt97DXt0ZWRAlms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730882540; h=Content-Transfer-Encoding:Cc:Cc: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; bh=DuKheEd+RIhCNNVlsfYRfvUtD5CnI0aqPx70+3FcBsM=; b=jtRCv7YBIN+qnsp4WqKEbZ99T/b3X5lvQmM9v1sF7WBXSDmmVPufPTyNgx90Qr6pbNzmLzPUqEY5VirwZyUuukpJYv65rHHFONUoixxneLgs37Xx3QXoYmeO75JUt0bAdC6ckxgdEjKZAThDYyMC9UOy/YTy4I3izL+aCRWPkfo= 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 1730882540432291.91787802666045; Wed, 6 Nov 2024 00:42:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8bc9-0005WD-N5; Wed, 06 Nov 2024 03:42:10 -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 1t8bc7-0005VM-9S for qemu-devel@nongnu.org; Wed, 06 Nov 2024 03:42:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8bc5-0007Uj-LF for qemu-devel@nongnu.org; Wed, 06 Nov 2024 03:42:06 -0500 Received: from mx-prod-mc-01.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-211-eDi7X9LaOWWCVs0cCHKRgQ-1; Wed, 06 Nov 2024 03:41:59 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 76AC71955F3E; Wed, 6 Nov 2024 08:41:58 +0000 (UTC) Received: from fedora.nay.redhat.com (unknown [10.66.57.68]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1C9861955F40; Wed, 6 Nov 2024 08:41:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730882524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DuKheEd+RIhCNNVlsfYRfvUtD5CnI0aqPx70+3FcBsM=; b=gweZJbfjhh8tu35cPXxzdsmreO46nyS7mXaLWtYW2AoRQ4UFZLQF4IeCtT8p9Bso7aBmYD 8hkB576bLyZBHXeeFij6iroswgFl7Qc6j43KXsS+lUttbNLvEP94Psi5n+6s4K7+y7ZODL A/EVf7GQjJ6rb/0zRFcygKy56J22Qqw= X-MC-Unique: eDi7X9LaOWWCVs0cCHKRgQ-1 X-Mimecast-MFC-AGG-ID: eDi7X9LaOWWCVs0cCHKRgQ From: Dehan Meng To: qemu-devel@nongnu.org Cc: demeng@redhat.com, kkostiuk@redhat.com, michael.roth@amd.com, peter.maydell@linaro.org, berrange@redhat.com Subject: [PATCH v5 3/3] qemu-ga: Avoiding freeing line prematurely Date: Wed, 6 Nov 2024 16:41:34 +0800 Message-Id: <20241106084134.1133061-4-demeng@redhat.com> In-Reply-To: <20241106084134.1133061-1-demeng@redhat.com> References: <20241106084134.1133061-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.129.124; envelope-from=demeng@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_H2=-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: 1730882541041116600 Content-Type: text/plain; charset="utf-8" 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 --- qga/commands-linux.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 55c35bfc8f..70020621bf 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2138,8 +2138,7 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **errp) is_ipv6 =3D (i =3D=3D 1); fp =3D fopen(routeFiles[i], "r"); if (fp =3D=3D NULL) { - error_setg_errno(errp, errno, "open(\"%s\")", routeFiles[i]); - free(line); + error_setg_errno(errp, errno, "open(\"%s\")", route_files[i]); continue; } =20 @@ -2148,7 +2147,6 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **errp) firstLine =3D 0; continue; } - =20 if (is_ipv6) { char destination[33], source[33], next_hop[33]; int des_prefixlen, src_prefixlen, metric, refcnt, use, fla= gs; @@ -2215,9 +2213,8 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **errp) QAPI_LIST_APPEND(tail, route); } =20 - free(line); fclose(fp); } - + free(line); return head; } --=20 2.40.1