From nobody Tue Oct 22 22:32:09 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=1729517484; cv=none; d=zohomail.com; s=zohoarc; b=c2zZnVly5VflY2hsrvhtze/2dbRMhYSr6uy5qJKQPCSQwUIBHysVtW/ID7E7npFyfFXkWKtJUIeKA/tqk7pHKd5JU1G0Ky47m5fkfxxm82F4cB517iC0fVloQ9+lsxgwoWR9sc2cRrnB2PrOk8Y3/vzBUfknBtH+VE0hBcWLnU0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729517484; 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=34PkQkzS2fJKjA97jCvEOEfq09+BKhcwhQ4YHpj/pVU=; b=Zjn7+gfVN0tL5pmd5n4/F07djepCduaPKLchj8fndfzFCDPcnQZbP0gHTe+b4URqsTVUIaLwYD9pYhX7aRuZHTIhvrrNdSSwGvPwOw1DMFTTsaNPxTtpIU90la5P+TvIEmBbzAexQnm2yvt+1wpP+26Wa9LmQiiJdBVXSYhH/v8= 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 1729517483996316.29871666286; Mon, 21 Oct 2024 06:31:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2sTU-0006EW-Jt; Mon, 21 Oct 2024 09:29:33 -0400 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 1t2sTL-0006DI-Hv for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:26 -0400 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 1t2sTK-0000iF-64 for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:23 -0400 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-340-YJhCWXwrP5mM0P1ztRFuZw-1; Mon, 21 Oct 2024 09:29:20 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 F24011955EAD; Mon, 21 Oct 2024 13:29:18 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.116.80]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1D40719560AA; Mon, 21 Oct 2024 13:29:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729517361; 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=34PkQkzS2fJKjA97jCvEOEfq09+BKhcwhQ4YHpj/pVU=; b=ac2r2mN+8dQo3puxa18fo0ebwj0G3DkTJQ/ctUFERogI2/OtldFNmy0RMnwEKR8Yg179h5 G+7j/0CWXdP/OcwDC78KJwGwUR0Vijf6ky3TzhMsPwhLsP/sK5HXwRmhhdo8zKi/vgu4gH Assqq7MREw86dliAgUoQcYLmQVeTlyg= X-MC-Unique: YJhCWXwrP5mM0P1ztRFuZw-1 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 v3 1/4] qemu-ga: 'Null' check for mandatory parameters Date: Mon, 21 Oct 2024 21:28:36 +0800 Message-Id: <20241021132839.463255-7-demeng@redhat.com> In-Reply-To: <20241021132839.463255-1-demeng@redhat.com> References: <20241021132839.463255-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.421, 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: 1729517484350116600 Content-Type: text/plain; charset="utf-8" sscanf return values are checked and add 'Null' check for mandatory parameters. Signed-off-by: Dehan Meng --- qga/commands-linux.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 51d5e3d927..f0e9cdd27c 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 @@ -2164,6 +2166,10 @@ GuestNetworkRouteList *qmp_guest_network_get_route(E= rror **errp) networkroute =3D route; networkroute->iface =3D g_strdup(Iface); networkroute->destination =3D hexToIPAddress(Destination, = 1); + if (networkroute->destination =3D=3D NULL) { + g_free(route); + continue; + } networkroute->metric =3D Metric; networkroute->source =3D hexToIPAddress(Source, 1); networkroute->desprefixlen =3D g_strdup_printf( @@ -2195,6 +2201,10 @@ GuestNetworkRouteList *qmp_guest_network_get_route(E= rror **errp) networkroute =3D route; networkroute->iface =3D g_strdup(Iface); networkroute->destination =3D hexToIPAddress(&Destination,= 0); + if (networkroute->destination =3D=3D NULL) { + g_free(route); + continue; + } networkroute->gateway =3D hexToIPAddress(&Gateway, 0); networkroute->mask =3D hexToIPAddress(&Mask, 0); networkroute->metric =3D Metric; --=20 2.40.1 From nobody Tue Oct 22 22:32:09 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=1729517378; cv=none; d=zohomail.com; s=zohoarc; b=Khp/7c8fiCHiuL3K70qq/C4N82c3YjTASiCiZzmCMISfJAv7oG2xK+SHXjmwY2dPwInl4o+OLheo2ODx18cmcgNixQw9YGrcf89ZdnTCg3m/9S9Bix1EmpsJPwhXL2k9YFGQHyvBTxqnNnWRIwmSMv4ymUrEwArqp5yitCtUE5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729517378; 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=dFJX0RXBRI609Uw2UE3rlCY7D25DaDb/nXWwGlBpCt0=; b=CKXfcMQA1VZhDSc4J8HwAhM8zYYvMDegZcWKithMMnS1WpnJIbunt5BXupbuc33OUCliZXitP6nNrbWXX8J46rHslhxaQWOYHQ2OYagb9wgr22rDOE0Ix/n94M96Y+OpZBsFeqkXiigyrCIYNSPTnO6zTubs6O5r/BAa8pQpzfE= 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 1729517378418618.9644132954414; Mon, 21 Oct 2024 06:29:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2sTD-00069y-8K; Mon, 21 Oct 2024 09:29:15 -0400 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 1t2sT3-000691-VU for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:07 -0400 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 1t2sSz-0000dZ-8G for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:05 -0400 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-412-MQmh2p6ROGiRiYRBQWuaaw-1; Mon, 21 Oct 2024 09:28:57 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 F22751955EE6; Mon, 21 Oct 2024 13:28:55 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.116.80]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3667119560AA; Mon, 21 Oct 2024 13:28:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729517338; 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=dFJX0RXBRI609Uw2UE3rlCY7D25DaDb/nXWwGlBpCt0=; b=N2/sWXtYe1FTmnS9Ueb8KWp8a5vmTV9tZhRU50P0WGj5VtYz8Xtu0DcyE+KuleqK8ENoDr JUEd4FzvW6Dy1dTZaQUCkKQ+8mlPVgTJ6DfSAgYDJk/qC53EdzA237rm/2bdzrudbG3Fy3 JuJtoU8yIOKcOw0O5fb0FvuH4C4R+/U= X-MC-Unique: MQmh2p6ROGiRiYRBQWuaaw-1 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 v2 1/4] sscanf return values are checked to ensure correct parsing. Date: Mon, 21 Oct 2024 21:28:31 +0800 Message-Id: <20241021132839.463255-2-demeng@redhat.com> In-Reply-To: <20241021132839.463255-1-demeng@redhat.com> References: <20241021132839.463255-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.421, 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: 1729517379620116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Dehan Meng --- qga/commands-linux.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 51d5e3d927..2c2b5f4ff2 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 --=20 2.40.1 From nobody Tue Oct 22 22:32:09 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=1729517463; cv=none; d=zohomail.com; s=zohoarc; b=EcvnfrPrV/A5GMbK5NupHEIBTR8aA05xDb+DcClhU4MKwYf16HQDC0CQZEIyaPCHhOvDx8WwWtyK7wxxjvYWbHfm0nt1jjlYEw5I7aSomul17nPkeR3+HDDmjAjXg7o2QEf3+Z+jTT6MgZ3SMeAG5gnJ/vIToLoUxzqgfBL2qqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729517463; 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=89BuzVL2Ofdj6f7IOw3BkvNQfFJUf/0FqCtxr/n1RD0=; b=ONU/IVXh68OrmZeeKBtTurQ28qUPtJtq27PMMgItZ8JnVip9C4pJmSvUUAbppiXNwchwSAqfxOwvFcl+W80emeUP2cgSSKGjoAXROQx/eII5v3wmcUWA5qoaIvoYfRIEW0SXlpNneO09CyA9o1K3dDGPfQbJDhkWWlXDHFrugFY= 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 1729517463862462.2757061488942; Mon, 21 Oct 2024 06:31:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2sTa-0006SD-Hl; Mon, 21 Oct 2024 09:29:38 -0400 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 1t2sTS-0006Eo-PG for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:32 -0400 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 1t2sTR-0000iR-GW for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:30 -0400 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-365-3fmyaRRhNJK-4GNQCkLasQ-1; Mon, 21 Oct 2024 09:29:24 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 9643019560A3; Mon, 21 Oct 2024 13:29:23 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.116.80]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B13B819560AA; Mon, 21 Oct 2024 13:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729517367; 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=89BuzVL2Ofdj6f7IOw3BkvNQfFJUf/0FqCtxr/n1RD0=; b=GprlhFXJHZk9t1D6513KmfxjXpa6dWrpG52WGWoDoVz/vKnTQsJ2FpMU5N32jKtIZHk0HI k2Zd02OyDSgX+jMNkBoOYD7bckhhvuUvdGGVxVxLUNjKJcuyBEd7/HHeep/y/XC9NcVz5d qTen9t+iyJ3qwz6hpFzV9sSaxMSUHIY= X-MC-Unique: 3fmyaRRhNJK-4GNQCkLasQ-1 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 v3 2/4] qemu-ga: Initialize correctly so getline works properly Date: Mon, 21 Oct 2024 21:28:37 +0800 Message-Id: <20241021132839.463255-8-demeng@redhat.com> In-Reply-To: <20241021132839.463255-1-demeng@redhat.com> References: <20241021132839.463255-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.421, 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=-1.699, 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: 1729517464110116600 Content-Type: text/plain; charset="utf-8" Proper initialization of param 'size_t n' to '0' for getline to function correctly. Signed-off-by: Dehan Meng Reviewed-by: Daniel P. Berrang=C3=A9 --- qga/commands-linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index f0e9cdd27c..32bf1b8ce7 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2126,7 +2126,7 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **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; --=20 2.40.1 From nobody Tue Oct 22 22:32:09 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=1729517391; cv=none; d=zohomail.com; s=zohoarc; b=WecdpahGdQkig+ULkt7sNs+1XgfCNxiRepm56Jb545nIJIk+O2DZ/55fsN14XIIrtM9X6u6Hbo+iXpJPqS4XTWfYLA5QM1qhvEZEWe4WMelhA/dB7tXFaSi9ahl9jOHSrVxfHslR4wIgUooFsjwGB4X878xws4XdVaL6Z7IuG/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729517391; 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=KgdZ+HD0518zqi0YLO1K0m739vSttIHyUWJfEt1DIKY=; b=TJC2aMnwqg4hQVUtBKvwOHNoEZypojl5/Y1NPyjdInd1BmJ9XHNgdRbaaLRUUyCkOC75D3QDQ2+t7yxDzPXqY8sC90IwqzbUMAbGGS5MKrr7HYmy0feI7hGe+3T2Xf+FR/cZH8+SMdttM+7hDkTUXu9vx1TUy3ql2tAoSzqG8xo= 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 1729517391780971.5003767004762; Mon, 21 Oct 2024 06:29:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2sTF-0006AD-Cx; Mon, 21 Oct 2024 09:29:17 -0400 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 1t2sTB-00069q-2Y for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:13 -0400 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 1t2sT3-0000et-Ao for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:07 -0400 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-413-ibJAYMk2OeumM23Hru9Jsw-1; Mon, 21 Oct 2024 09:29:01 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 7D1891955D61; Mon, 21 Oct 2024 13:29:00 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.116.80]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CF41F19560AA; Mon, 21 Oct 2024 13:28:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729517344; 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=KgdZ+HD0518zqi0YLO1K0m739vSttIHyUWJfEt1DIKY=; b=I4+/9zbeUAJvNd6sDTRayk0/t7s7ZCXFHPOkgqNxP0jRtKraYDOSxC6aXPyTAnuNOULhlh aWHHQrMqLYaJ3iJ5QpQUe35lHqpX51qiS1OfvCURqAdvDPonRSROT7LZJgzL2+wIE0lk+r 1+Kwl9RGRFfmvEWnkZz+HKhPHYkkZRc= X-MC-Unique: ibJAYMk2OeumM23Hru9Jsw-1 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 v2 2/4] Proper initialization of n to 0 for getline to function correctly. Date: Mon, 21 Oct 2024 21:28:32 +0800 Message-Id: <20241021132839.463255-3-demeng@redhat.com> In-Reply-To: <20241021132839.463255-1-demeng@redhat.com> References: <20241021132839.463255-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.421, 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=-1.699, 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: 1729517393636116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Dehan Meng --- qga/commands-linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 2c2b5f4ff2..b905f33a57 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2126,7 +2126,7 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **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; --=20 2.40.1 From nobody Tue Oct 22 22:32:09 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=1729517473; cv=none; d=zohomail.com; s=zohoarc; b=lf+3hJ0vcOl6zg7LtRv3Qbv0Z/t/Mf/luS9+c/YW21lWPmZZgYocXZG7Z9EFlRMIgnHuf/uhPa9OkKn7E1N3/CIOz7KTHdBAS7w5Uyx12C0p7+YygCqX8gd02TMyCIvfHZNS6giwQaORYxWKszaDwhnuhIRqLk8kYUsWJwp985g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729517473; 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=En4E4bV6p0hB9ksV+UIpl4B2QQPRkJ/JelXvBFQNfuk=; b=gXBtXRCx6kNOn4AwN9lWFpBvztl1Wan6diX/jeKx7kyXDyGPeSsLcaFpPYWPgfcECmZGMVXifLutwQ46u4q6B3gWTJPCGQcDzA8E9rJYyBnYbFbvf9oVaUXkD4u73a/LotisveTHZmQsBEg/x/g8836mqs0l+iQhOppNJtbtAdA= 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 172951747396376.01332168984948; Mon, 21 Oct 2024 06:31:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2sTI-0006BK-Vq; Mon, 21 Oct 2024 09:29:21 -0400 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 1t2sTC-00069z-8O for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:15 -0400 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 1t2sTA-0000gt-Rg for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:14 -0400 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-531-o4phB6ZmNM6ewClXsl0ZXQ-1; Mon, 21 Oct 2024 09:29:06 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 079781955EA9; Mon, 21 Oct 2024 13:29:05 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.116.80]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5885319560AA; Mon, 21 Oct 2024 13:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729517350; 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=En4E4bV6p0hB9ksV+UIpl4B2QQPRkJ/JelXvBFQNfuk=; b=OTioEiuLNQ40J0NbOVV6umuPK4I2zGkcuZNZvH3ikwiWuLaX0k9RmbYR/iL/Z4l6HU53an GjTACqVF61P6/rEB1eOxdOd6EnuJwt88H+ypBhug90G8/pcOedWl8f+9IZiyUeCS+dyJx+ C+8u/VxOvwlD6Pl3h5yu54DZ/Ar5buE= X-MC-Unique: o4phB6ZmNM6ewClXsl0ZXQ-1 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 v2 3/4] Avoiding freeing line prematurely. It's now only freed at the end of the function. Date: Mon, 21 Oct 2024 21:28:33 +0800 Message-Id: <20241021132839.463255-4-demeng@redhat.com> In-Reply-To: <20241021132839.463255-1-demeng@redhat.com> References: <20241021132839.463255-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.421, 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=-1.699, 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: 1729517476279116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Dehan Meng --- qga/commands-linux.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index b905f33a57..4f0e38be81 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2137,8 +2137,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 @@ -2218,9 +2217,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 From nobody Tue Oct 22 22:32:09 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=1729517477; cv=none; d=zohomail.com; s=zohoarc; b=WEMeOKnzYbUH6L334k08Qho1GQbJRRCIHas1R7tWglnaKSpaBEJPdCvngfPOO4azDIf8a6MXwEaNNfAYCjF3OUZ79TMHeA5w+XloVCO163xUhr2c72vFjltaeOl1EBEo7CFNjuIkQqMl041MyMiL43mHbZAH29ymLVHMdD07MNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729517477; 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=S70GhYB7laEL2fnTCNmkV4yqr3u8YRvyEUuIY22drcU=; b=B0WHZXCxSpjvStYdsbWWlJHqVOe/NIKSvk8roWcgJXg3/qQ+RuGHM3cYAKXEVVDFpTJ8fkBdGlw6c94B3fkPurduIevUwPjX9/JFq/z9NnnVaVXLqVLVy3sLq+Ce2Y37cLkz+VHbT4FzDvCta/7KCUMyBQZA/pUjjxXZDdTsNTY= 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 1729517477859807.3776855000821; Mon, 21 Oct 2024 06:31:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2sTc-0006V6-6f; Mon, 21 Oct 2024 09:29:40 -0400 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 1t2sTX-0006ND-FU for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:36 -0400 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 1t2sTV-0000ie-8h for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:34 -0400 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-55-fH6WnoLZOgGCFlOyS_A4hw-1; Mon, 21 Oct 2024 09:29:29 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 26FA41955D64; Mon, 21 Oct 2024 13:29:28 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.116.80]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 72C0B1955E83; Mon, 21 Oct 2024 13:29:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729517372; 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=S70GhYB7laEL2fnTCNmkV4yqr3u8YRvyEUuIY22drcU=; b=W0PffRVo29fnNH+cFTzYSqgSaJP6jtQ8Lg9s17Zmxc6hKErt3x+ErS9ehUXqEyMF5cxuu1 izeAu21hapVnZNnSnFL8y3ew4nlObw+gDGxOtNBTt8RZTm1IchusTDFG6ThsjBdeMFQZMH UOAVhMgqbDFEQGmKn8gL3tTaUDQWWBQ= X-MC-Unique: fH6WnoLZOgGCFlOyS_A4hw-1 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 v3 3/4] qemu-ga: Avoiding freeing line prematurely Date: Mon, 21 Oct 2024 21:28:38 +0800 Message-Id: <20241021132839.463255-9-demeng@redhat.com> In-Reply-To: <20241021132839.463255-1-demeng@redhat.com> References: <20241021132839.463255-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.421, 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=-1.699, 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: 1729517478251116600 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 --- qga/commands-linux.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 32bf1b8ce7..c6bda78de6 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -2137,8 +2137,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 @@ -2226,9 +2225,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 From nobody Tue Oct 22 22:32:09 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=1729517451; cv=none; d=zohomail.com; s=zohoarc; b=OzvdT6wkG0bOeU/Mag8pDq2WZPHvV53jfQ7FcPc5MU4Y1Q9csax1bxUwFItYiBsbR490Lg2/Fm0g0VnNiUbD8hw5W0oeQp1heZr3Eg/V+IKi7+XgOC9yjXa8mX4PLWrA9Mp5c0lOC/HyTEQ4B5QCK+nc1as+uZmsjDBoMrhldQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729517451; 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=GMfIQhe17p2ivo5PbtzSl9PDX/c5D9ZRqiDdt6z+ru4=; b=iY9TA6hnAy8Kq1zdrerefbD3oTcHAvrM+92q5W5OxtMeyVlVM4dNx2vjeiyQD2mqMrHXqpDjUSevm4k9e06OsbLVwemDFr3O2cHrOYMbM9cjhET4nk8s/T6pPAmUOq/dR9QUY7Si0zYUUIjtWlwTUH+bXRLm7Z44TLdupWK1YXQ= 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 172951745167163.89408382508361; Mon, 21 Oct 2024 06:30:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2sTG-0006Au-C3; Mon, 21 Oct 2024 09:29:18 -0400 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 1t2sTE-0006AE-A7 for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:17 -0400 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 1t2sTC-0000hf-Ji for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:16 -0400 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-517-5iAmTfGjNn2Gimzna1QH1Q-1; Mon, 21 Oct 2024 09:29:10 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 866D21955F42; Mon, 21 Oct 2024 13:29:09 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.116.80]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D85C21955F42; Mon, 21 Oct 2024 13:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729517353; 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=GMfIQhe17p2ivo5PbtzSl9PDX/c5D9ZRqiDdt6z+ru4=; b=CW5nLUcvr8M16RV2jyCHSckngBPOg6Pf3beMY7P9jkpzN2L36VgGjmar0PFF0X4NGLMNrf s9Fz3H9I7K78lXCfgxVd/GT+q9gmU2uB4SoxKZuqxZBvo94Awt2tMoBJF/O0QCdL8MEqJG qs9L6gvu1mlJbFO85Elf8BjD2GxHc+U= X-MC-Unique: 5iAmTfGjNn2Gimzna1QH1Q-1 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 v2 4/4] For correcting code style: Variable declarations moved to the beginning of blocks Followed the coding style of using snake_case for variable names. And merged redundant route and networkroute variables. Date: Mon, 21 Oct 2024 21:28:34 +0800 Message-Id: <20241021132839.463255-5-demeng@redhat.com> In-Reply-To: <20241021132839.463255-1-demeng@redhat.com> References: <20241021132839.463255-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.421, 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=-1.699, 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: 1729517452089116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Dehan Meng --- qga/commands-linux.c | 116 ++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 63 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 4f0e38be81..c6cca630ef 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); } @@ -2131,6 +2131,7 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **errp) int firstLine; int is_ipv6; int i; + char iface[IFNAMSIZ]; =20 for (i =3D 0; i < 2; i++) { firstLine =3D 1; @@ -2146,72 +2147,61 @@ GuestNetworkRouteList *qmp_guest_network_get_route(= Error **errp) firstLine =3D 0; continue; } - GuestNetworkRoute *route =3D NULL; - GuestNetworkRoute *networkroute; - char Iface[IFNAMSIZ]; - if (is_ipv6) { - char Destination[33], Source[33], NextHop[33]; - int DesPrefixlen, SrcPrefixlen, Metric, RefCnt, Use, Flags; =20 - /* Parse the line and extract the values */ + GuestNetworkRoute *route =3D g_new0(GuestNetworkRoute, 1); + + if (is_ipv6) { + 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 - 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; - } else { - unsigned int Destination, Gateway, Mask, Flags; - int RefCnt, Use, Metric, MTU, Window, IRTT; + route->iface =3D g_strdup(iface); + route->destination =3D hex_to_ip_address(destination, 1); + 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; =20 - /* Parse the line and extract the values */ + } else { + 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 - 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 hex_to_ip_address(&destination, 0); + 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 Tue Oct 22 22:32:09 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=1729517415; cv=none; d=zohomail.com; s=zohoarc; b=MOlVwA0V6aGrBs8jWx0g7bSWr2cdtMrKr+jOxup1tDfJb2BtWahgDJbEVNzMUkGS8MKLjoTSG4Fla6iBUcPucCbKzoq/vSg24/OkTXrHc1/Bf0dFru1MD842/ISwv11uPLwikRIT8YAR2wiYDvVwfMnWZhwfsWIOaRy0ADk/X28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729517415; 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=KDB7yqyLSkekI+4rK0f7/fU5zZnfA/c1IE3lqJrMDJI=; b=EGGnwsTsX/DQ1UxGYgimwasvUp3ICg9c175Fb1wGRwjPCYuW+E5RBxORPWmaEf19k8IVTKjyl0E3m5EkuZ/uWidQM42SlgsmHHD9ij0cHvGxUz0UJOLGNYEbwjrwIs37opTWYILqRVi7pHTqP6rsD/vtYLMxwEDdyCxOQa/yWAY= 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 1729517415394471.9427330795246; Mon, 21 Oct 2024 06:30:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2sTg-0006Xz-Kl; Mon, 21 Oct 2024 09:29:44 -0400 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 1t2sTb-0006VH-VT for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:40 -0400 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 1t2sTZ-0000iw-VY for qemu-devel@nongnu.org; Mon, 21 Oct 2024 09:29:39 -0400 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-384-Wnjycne3P-23QrNnkIg9HQ-1; Mon, 21 Oct 2024 09:29:33 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 BAF9C19560A3; Mon, 21 Oct 2024 13:29:32 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.116.80]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 14DB21955F43; Mon, 21 Oct 2024 13:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729517377; 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=KDB7yqyLSkekI+4rK0f7/fU5zZnfA/c1IE3lqJrMDJI=; b=IALPUw/i8ztUuKO6O7Dkb54jtPDkOb23BxM6+ajlSKT6XoU5Mi20YWoi5md6o0oUhybuFj kxGsiKqRB7reVZs3z62YnG24I2gFhlIvwvZbWMYHSt3Cdc/8R6UKbGYFwkVu2p1T+sA1hI N/5UECknIREPJ/ejoO9OSddqxk++tao= X-MC-Unique: Wnjycne3P-23QrNnkIg9HQ-1 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 v3 4/4] qemu-ga: For correcting code style Date: Mon, 21 Oct 2024 21:28:39 +0800 Message-Id: <20241021132839.463255-10-demeng@redhat.com> In-Reply-To: <20241021132839.463255-1-demeng@redhat.com> References: <20241021132839.463255-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.421, 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: 1729517415989116600 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. And merged redundant route and networkroute variables. Signed-off-by: Dehan Meng --- qga/commands-linux.c | 123 ++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 65 deletions(-) diff --git a/qga/commands-linux.c b/qga/commands-linux.c index c6bda78de6..9fb31956b4 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); } @@ -2131,6 +2131,7 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Er= ror **errp) int firstLine; int is_ipv6; int i; + char iface[IFNAMSIZ]; =20 for (i =3D 0; i < 2; i++) { firstLine =3D 1; @@ -2146,80 +2147,72 @@ GuestNetworkRouteList *qmp_guest_network_get_route(= Error **errp) firstLine =3D 0; continue; } - GuestNetworkRoute *route =3D NULL; - GuestNetworkRoute *networkroute; - char Iface[IFNAMSIZ]; - if (is_ipv6) { - char Destination[33], Source[33], NextHop[33]; - int DesPrefixlen, SrcPrefixlen, Metric, RefCnt, Use, Flags; =20 - /* Parse the line and extract the values */ + if (is_ipv6) { + 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 - route =3D g_new0(GuestNetworkRoute, 1); - networkroute =3D route; - networkroute->iface =3D g_strdup(Iface); - networkroute->destination =3D hexToIPAddress(Destination, = 1); - if (networkroute->destination =3D=3D NULL) { + GuestNetworkRoute *route =3D g_new0(GuestNetworkRoute, 1); + + route->destination =3D hex_to_ip_address(destination, 1); + if (route->destination =3D=3D NULL) { g_free(route); continue; } - 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; + route->iface =3D g_strdup(iface); + route->destination =3D hex_to_ip_address(destination, 1); + 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; - - /* 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 - route =3D g_new0(GuestNetworkRoute, 1); - networkroute =3D route; - networkroute->iface =3D g_strdup(Iface); - networkroute->destination =3D hexToIPAddress(&Destination,= 0); - if (networkroute->destination =3D=3D NULL) { + GuestNetworkRoute *route =3D g_new0(GuestNetworkRoute, 1); + + route->destination =3D hex_to_ip_address(destination, 1); + if (route->destination =3D=3D NULL) { g_free(route); continue; } - 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 hex_to_ip_address(&destination, 0); + 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