From nobody Sat Nov 23 20:05:48 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=1730727755; cv=none; d=zohomail.com; s=zohoarc; b=PBsCru/7ceIL3kHZyEtrEeHN10FvGtoYT0878qFiOyIYuptjcgHtRZLeFSaZX1ZSB8+MZwEp1zGrnfSD+N1cd85+L9A5yF1HwS9t/NeYYfjwHIv+EoM9eL3Wg7X00jbMqaN9BZpBul2csmgkNIuWAvpQyoxtlk2VyVR9DuwVs2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730727755; h=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=RPthFrMxmhKGom/Zvwb9lQV5GfKcxFkTWB5GPax1qUo=; b=dB4kJMkyUTYum9PCoWrsbPdozOnivQpr8cjPRFlYe7NiyssVbxjecykeaOwV5COGNV/+crz2nuiHfx9mRx+AR5+gvmkIgJyoEObMEcNUiMXVHkWYB6Qg2/JGxzSMrLUay1Pbs5oSU0l11jvBuxpEjs2EhvRq8EbK29r6H3QwOIU= 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 1730727755071527.8552838930513; Mon, 4 Nov 2024 05:42:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7xLF-00017h-Gl; Mon, 04 Nov 2024 08:42:01 -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 1t7xLB-00016d-6h for qemu-devel@nongnu.org; Mon, 04 Nov 2024 08:41:57 -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 1t7xL9-0002nQ-DJ for qemu-devel@nongnu.org; Mon, 04 Nov 2024 08: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-255-Ts0PFCkjPdmCvAydVlMPLw-1; Mon, 04 Nov 2024 08:41:48 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 7215419560AE; Mon, 4 Nov 2024 13:41:47 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.226.47]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D25131956086; Mon, 4 Nov 2024 13:41:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730727714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RPthFrMxmhKGom/Zvwb9lQV5GfKcxFkTWB5GPax1qUo=; b=SNisPrYrvsAHV4d3QfgcVWSxUXgcTSQeqV1icRx2hB3HIPlsmSsl0uOube0ZIPYWzfMdlK HuAWRPJ1whJSFLmRseyHtcuxdNcNjeSpTpKPdle4U15tyes9tw9g23APDyV5PCA3+RfQq9 ifzmVRfGupcLrwiNcIJKfolrlNxJO+I= X-MC-Unique: Ts0PFCkjPdmCvAydVlMPLw-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Peter Maydell , Stefan Hajnoczi , Richard Henderson Subject: [PULL 1/3] qga: fix -Wsometimes-uninitialized windows warning Date: Mon, 4 Nov 2024 15:41:37 +0200 Message-ID: <20241104134139.225514-2-kkostiuk@redhat.com> In-Reply-To: <20241104134139.225514-1-kkostiuk@redhat.com> References: <20241104134139.225514-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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=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_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: 1730727755630116600 Content-Type: text/plain; charset="utf-8" From: Pierrick Bouvier Reported by clang, but not gcc. [5123/5678] Compiling C object qga/qemu-ga.exe.p/commands-windows-ssh.c.obj FAILED: qga/qemu-ga.exe.p/commands-windows-ssh.c.obj "cc" "-Iqga/qemu-ga.exe.p" "-Iqga" "-I../qga" "-I." "-Iqapi" "-Itrace" "-Iu= i" "-Iui/shader" "-IC:/msys64/clangarm64/include/glib-2.0" "-IC:/msys64/cla= ngarm64/lib/glib-2.0/include" "-fdiagnostics-color=3Dauto" "-Wall" "-Winval= id-pch" "-Werror" "-std=3Dgnu11" "-O2" "-g" "-fstack-protector-strong" "-We= mpty-body" "-Wendif-labels" "-Wexpansion-to-defined" "-Wformat-security" "-= Wformat-y2k" "-Wignored-qualifiers" "-Winit-self" "-Wmissing-format-attribu= te" "-Wmissing-prototypes" "-Wnested-externs" "-Wold-style-definition" "-Wr= edundant-decls" "-Wstrict-prototypes" "-Wtype-limits" "-Wundef" "-Wvla" "-W= write-strings" "-Wno-gnu-variable-sized-type-not-at-end" "-Wno-initializer-= overrides" "-Wno-missing-include-dirs" "-Wno-psabi" "-Wno-shift-negative-va= lue" "-Wno-string-plus-int" "-Wno-tautological-type-limit-compare" "-Wno-ty= pedef-redefinition" "-Wthread-safety" "-iquote" "." "-iquote" "C:/w/qemu" "= -iquote" "C:/w/qemu/include" "-iquote" "C:/w/qemu/host/include/aarch64" "-i= quote" "C:/w/qemu/host/include/generic" "-iquote" "C:/w/qemu/tcg/aarch64" "= -D_GNU_SOURCE" "-D_FILE_OFFSET_BITS=3D64" "-D_LARGEFILE_SOURCE" "-fno-stric= t-aliasing" "-fno-common" "-fwrapv" "-fno-pie" "-ftrivial-auto-var-init=3Dz= ero" "-fzero-call-used-regs=3Dused-gpr" -MD -MQ qga/qemu-ga.exe.p/commands-= windows-ssh.c.obj -MF "qga/qemu-ga.exe.p/commands-windows-ssh.c.obj.d" -o q= ga/qemu-ga.exe.p/commands-windows-ssh.c.obj "-c" ../qga/commands-windows-ss= h.c ../qga/commands-windows-ssh.c:383:9: error: variable 'userPSID' is used uni= nitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitializ= ed] 383 | if (!create_acl(userInfo, &pACL, errp)) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../qga/commands-windows-ssh.c:415:15: note: uninitialized use occurs here 415 | LocalFree(userPSID); | ^~~~~~~~ ../qga/commands-windows-ssh.c:383:5: note: remove the 'if' if its condition= is always false 383 | if (!create_acl(userInfo, &pACL, errp)) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 384 | goto error; | ~~~~~~~~~~~ 385 | } | ~ ../qga/commands-windows-ssh.c:380:18: note: initialize the variable 'userPS= ID' to silence this warning 380 | PSID userPSID; | ^ | =3D NULL 1 error generated. Signed-off-by: Pierrick Bouvier Reviewed-by: Konstantin Kostiuk Link: https://lore.kernel.org/r/20241031040426.772604-6-pierrick.bouvier@li= naro.org Signed-off-by: Konstantin Kostiuk --- qga/commands-windows-ssh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/commands-windows-ssh.c b/qga/commands-windows-ssh.c index 6a642e3ba8..df45c17b75 100644 --- a/qga/commands-windows-ssh.c +++ b/qga/commands-windows-ssh.c @@ -377,7 +377,7 @@ error: static bool set_file_permissions(PWindowsUserInfo userInfo, Error **errp) { PACL pACL =3D NULL; - PSID userPSID; + PSID userPSID =3D NULL; =20 /* Creates the access control structure */ if (!create_acl(userInfo, &pACL, errp)) { --=20 2.47.0 From nobody Sat Nov 23 20:05:48 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=1730727738; cv=none; d=zohomail.com; s=zohoarc; b=nYV6O8AVIkIq1ZXUf8NCzTtch9VDxhUjrzfHiJMoWG0QKb1ib1kvPaMO2Yc0pEF9beAuLN6I8Sd7rpC9vj136/4G/r7to2g+dQVmDsTr58nDwqnLJM/s4xX4LquoatkOLXLlZR5vbCowCZ6RkkUwM4SdCiVzBEfCvXbwojVvAIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730727738; 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=XCxCbwJhT84ro2F56D8d8/42Ll9ptQpTH8wGx4HWQFQ=; b=LSfK6PatWgYAHwwzZkiYBYE+V0YkWMkgkGy651/ToVfVdVg9Qw4BeeieM9UjfqH9NN5K1C+4EPPEK9dZR0fec3aw29FzJQiYjawiXOrCOrkZqk+EY/UCEZGOI8rVWjPIp3LTzw16UKTTRBy4pZmfcd9myAzuZ4FkNl8rqCxxrQQ= 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 1730727738814264.93886677823207; Mon, 4 Nov 2024 05:42:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7xLF-000184-HN; Mon, 04 Nov 2024 08:42:01 -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 1t7xLB-00016Z-1A for qemu-devel@nongnu.org; Mon, 04 Nov 2024 08:41:57 -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 1t7xL8-0002nK-Fj for qemu-devel@nongnu.org; Mon, 04 Nov 2024 08:41:56 -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-12-ABTYQ7DlNaqBLDdMOlJMCg-1; Mon, 04 Nov 2024 08:41:50 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 908411956096; Mon, 4 Nov 2024 13:41:49 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.226.47]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EEEE21956086; Mon, 4 Nov 2024 13:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730727713; 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=XCxCbwJhT84ro2F56D8d8/42Ll9ptQpTH8wGx4HWQFQ=; b=TB+wsJGeB+ga1fdVoDLBHTyQ/qEne+kb0QYIl/zpr7WUEEWI+0d7DDd0aLPmDWsyVcG6lV ajV96MklNLGsInX0MuHXJ6xNjOBqeEpPeq/XNYkZ3D8QUcpTPRRfJlRcfAvmi4TiSzD7/z kdvk+rsmonm4nW+FSDtZF4bycBMDyUs= X-MC-Unique: ABTYQ7DlNaqBLDdMOlJMCg-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Peter Maydell , Stefan Hajnoczi , Richard Henderson Subject: [PULL 2/3] qga: fix missing static and prototypes windows warnings Date: Mon, 4 Nov 2024 15:41:38 +0200 Message-ID: <20241104134139.225514-3-kkostiuk@redhat.com> In-Reply-To: <20241104134139.225514-1-kkostiuk@redhat.com> References: <20241104134139.225514-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.15 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: 1730727739640116600 From: Pierrick Bouvier Reported by clang++, but not by g++. ../qga/vss-win32/provider.cpp:48:6: error: no previous prototype for functi= on 'LockModule' [-Werror,-Wmissing-prototypes] 48 | void LockModule(BOOL lock) | ^ ../qga/vss-win32/provider.cpp:48:1: note: declare 'static' if the function = is not intended to be used outside of this translation unit 48 | void LockModule(BOOL lock) | ^ | static ../qga/vss-win32/provider.cpp:531:13: error: no previous prototype for func= tion 'DllMain' [-Werror,-Wmissing-prototypes] 531 | BOOL WINAPI DllMain(HINSTANCE hinstDll, DWORD dwReason, LPVOID lpRe= served) | ^ ../qga/vss-win32/provider.cpp:531:1: note: declare 'static' if the function= is not intended to be used outside of this translation unit 531 | BOOL WINAPI DllMain(HINSTANCE hinstDll, DWORD dwReason, LPVOID lpRe= served) | ^ | static Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Konstantin Kostiuk Link: https://lore.kernel.org/r/20241031040426.772604-7-pierrick.bouvier@li= naro.org Signed-off-by: Konstantin Kostiuk --- qga/vss-win32/install.cpp | 6 +++++- qga/vss-win32/provider.cpp | 5 ++++- qga/vss-win32/requester.cpp | 8 ++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 84944133f7..5cea5bcf74 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -39,7 +39,7 @@ const GUID CLSID_WbemLocator =3D { 0x4590f811, 0x1d3a, 0x= 11d0, const GUID IID_IWbemLocator =3D { 0xdc12a687, 0x737f, 0x11cf, {0x88, 0x4d, 0x00, 0xaa, 0x00, 0x4b, 0x2e, 0x24} }; =20 -void errmsg(DWORD err, const char *text) +static void errmsg(DWORD err, const char *text) { /* * `text' contains function call statement when errmsg is called via c= hk(). @@ -242,6 +242,7 @@ out: } =20 /* Unregister this module from COM+ Applications Catalog */ +STDAPI COMUnregister(void); STDAPI COMUnregister(void) { qga_debug_begin; @@ -256,6 +257,7 @@ out: } =20 /* Register this module to COM+ Applications Catalog */ +STDAPI COMRegister(void); STDAPI COMRegister(void) { qga_debug_begin; @@ -380,11 +382,13 @@ out: return hr; } =20 +STDAPI_(void) CALLBACK DLLCOMRegister(HWND, HINSTANCE, LPSTR, int); STDAPI_(void) CALLBACK DLLCOMRegister(HWND, HINSTANCE, LPSTR, int) { COMRegister(); } =20 +STDAPI_(void) CALLBACK DLLCOMUnregister(HWND, HINSTANCE, LPSTR, int); STDAPI_(void) CALLBACK DLLCOMUnregister(HWND, HINSTANCE, LPSTR, int) { COMUnregister(); diff --git a/qga/vss-win32/provider.cpp b/qga/vss-win32/provider.cpp index cc72e5ef1b..a102a23fbf 100644 --- a/qga/vss-win32/provider.cpp +++ b/qga/vss-win32/provider.cpp @@ -45,7 +45,7 @@ const IID IID_IVssEnumObject =3D { 0xAE1C7110, 0x2F60, 0x= 11d3, {0x8A, 0x39, 0x00, 0xC0, 0x4F, 0x72, 0xD8, 0xE3} }; =20 =20 -void LockModule(BOOL lock) +static void LockModule(BOOL lock) { if (lock) { InterlockedIncrement(&g_nComObjsInUse); @@ -527,6 +527,9 @@ STDAPI DllCanUnloadNow() return g_nComObjsInUse =3D=3D 0 ? S_OK : S_FALSE; } =20 +EXTERN_C +BOOL WINAPI DllMain(HINSTANCE hinstDll, DWORD dwReason, LPVOID lpReserved); + EXTERN_C BOOL WINAPI DllMain(HINSTANCE hinstDll, DWORD dwReason, LPVOID lpReserved) { diff --git a/qga/vss-win32/requester.cpp b/qga/vss-win32/requester.cpp index 9884c65e70..4401d55e3a 100644 --- a/qga/vss-win32/requester.cpp +++ b/qga/vss-win32/requester.cpp @@ -254,8 +254,8 @@ out: qga_debug_end; } =20 -DWORD get_reg_dword_value(HKEY baseKey, LPCSTR subKey, LPCSTR valueName, - DWORD defaultData) +static DWORD get_reg_dword_value(HKEY baseKey, LPCSTR subKey, LPCSTR value= Name, + DWORD defaultData) { qga_debug_begin; =20 @@ -272,12 +272,12 @@ DWORD get_reg_dword_value(HKEY baseKey, LPCSTR subKey= , LPCSTR valueName, return dwordData; } =20 -bool is_valid_vss_backup_type(VSS_BACKUP_TYPE vssBT) +static bool is_valid_vss_backup_type(VSS_BACKUP_TYPE vssBT) { return (vssBT > VSS_BT_UNDEFINED && vssBT < VSS_BT_OTHER); } =20 -VSS_BACKUP_TYPE get_vss_backup_type( +static VSS_BACKUP_TYPE get_vss_backup_type( VSS_BACKUP_TYPE defaultVssBT =3D DEFAULT_VSS_BACKUP_TYPE) { qga_debug_begin; --=20 2.47.0 From nobody Sat Nov 23 20:05:48 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=1730727804; cv=none; d=zohomail.com; s=zohoarc; b=fqsJO/yvDWFVxQL6RXxD2eK41K+ud/dJ/brYy3Bl7WHw5RrZiNFTtj7sx48yirROMu7m/FXDRFasC7ewgGVEVYUiwBVU0BgXpRfhdrg2vkc+0Fwl4l+DtuBSgpjzHM0CAzZUyevUjWqAw++KVn5rAyWj3S6ubOje9GlymNXZ4ts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730727804; 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=IPgNMdwUA++5yD6QxalWg4dt+r96xlnr7ZEePzXiCwk=; b=YLU+CxfA6ustATIYx5ycQYVnBSCkWNcusVKxY9Ednfyn1ZxwJwWsUaOwsBrohmgAjjcRxUojK3te3Qhro/8O3qmqnl/L9owsnz597CasyotQNo19OwIn0I+WALom2fFj7SV9DN8LCZKQuBWYrNh4tyfZtPnv8DUELSpavcgpnWs= 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 1730727804468820.7640528582334; Mon, 4 Nov 2024 05:43:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7xLc-0001AZ-2g; Mon, 04 Nov 2024 08:42:24 -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 1t7xLC-00017B-MJ for qemu-devel@nongnu.org; Mon, 04 Nov 2024 08:41:59 -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 1t7xLA-0002ns-Oj for qemu-devel@nongnu.org; Mon, 04 Nov 2024 08:41:58 -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-572-SZ_qWaJlOR-ukP5RbUN8SQ-1; Mon, 04 Nov 2024 08:41:52 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 CFDF21955EE8; Mon, 4 Nov 2024 13:41:51 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.226.47]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 179021956086; Mon, 4 Nov 2024 13:41:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730727715; 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=IPgNMdwUA++5yD6QxalWg4dt+r96xlnr7ZEePzXiCwk=; b=J0KAGhEsqmcDnU53WaMGOwbFlzFc78vIrVJWxOAjvC/o3Is4XCi2jnx9+hc5mSfo/rOUgm 32wbV/4Hfo7Rr7jHaJMCpa9FIi0Mz8bfhNRGTfSfsSRg4t4mmGUVpubQFGw2f6OVHNzOOq Xp5v2GXmKoomIQUOISUfdwHtKZuNaZc= X-MC-Unique: SZ_qWaJlOR-ukP5RbUN8SQ-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Peter Maydell , Stefan Hajnoczi , Richard Henderson Subject: [PULL 3/3] qemu-ga: Fix a SIGSEGV in ga_run_command() helper Date: Mon, 4 Nov 2024 15:41:39 +0200 Message-ID: <20241104134139.225514-4-kkostiuk@redhat.com> In-Reply-To: <20241104134139.225514-1-kkostiuk@redhat.com> References: <20241104134139.225514-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.15 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: 1730727806178116600 From: Sunil Nimmagadda qemu-ga on a NetBSD -current VM terminates with a SIGSEGV upon receiving 'guest-set-time' command... Core was generated by `qemu-ga'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x000000000cd37a40 in ga_pipe_read_str (fd=3Dfd@entry=3D0xffffff922a20,= str=3Dstr@entry=3D0xffffff922a18) at ../qga/commands-posix.c:88 88 *str[len] =3D '\0'; [Current thread is 1 (process 1112)] (gdb) bt #0 0x000000000cd37a40 in ga_pipe_read_str (fd=3Dfd@entry=3D0xffffff922a20,= str=3Dstr@entry=3D0xffffff922a18) at ../qga/commands-posix.c:88 #1 0x000000000cd37b60 in ga_run_command (argv=3Dargv@entry=3D0xffffff922a9= 0, action=3Daction@entry=3D0xcda34b8 "set hardware clock to system time", = errp=3Derrp@entry=3D0xffffff922a70, in_str=3D0x0) at ../qga/commands-posix.c:164 #2 0x000000000cd380c4 in qmp_guest_set_time (has_time=3D, t= ime_ns=3D, errp=3Derrp@entry=3D0xffffff922ad0) at ../qga/commands-posix.c:304 #3 0x000000000cd253d8 in qmp_marshal_guest_set_time (args=3D, ret=3D, errp=3D0xffffff922b48) at qga/qga-qapi-commands.c:193 #4 0x000000000cd4e71c in qmp_dispatch (cmds=3Dcmds@entry=3D0xcdf5b18 , request=3Drequest@entry=3D0xf3c711a4b000, allow_oob=3Dallow_oob@entry=3Dfalse, cur_mon=3Dcur_mon@entry=3D0x0) at = ../qapi/qmp-dispatch.c:220 #5 0x000000000cd36524 in process_event (opaque=3D0xf3c711a79000, obj=3D0xf= 3c711a4b000, err=3D0x0) at ../qga/main.c:677 #6 0x000000000cd526f0 in json_message_process_token (lexer=3Dlexer@entry= =3D0xf3c711a79018, input=3D0xf3c712072480, type=3Dtype@entry=3DJSON_RCURLY, x=3D28, y=3D1) at ../qobject/json-stre= amer.c:99 #7 0x000000000cd93860 in json_lexer_feed_char (lexer=3Dlexer@entry=3D0xf3c= 711a79018, ch=3D125 '}', flush=3Dflush@entry=3Dfalse) at ../qobject/json-lexer.c:313 #8 0x000000000cd93a00 in json_lexer_feed (lexer=3Dlexer@entry=3D0xf3c711a7= 9018, buffer=3Dbuffer@entry=3D0xffffff922d10 "{\"execute\":\"guest-set-time\"= }\n", size=3D) at ../qobject/json-lexer.c:350 #9 0x000000000cd5290c in json_message_parser_feed (parser=3Dparser@entry= =3D0xf3c711a79000, buffer=3Dbuffer@entry=3D0xffffff922d10 "{\"execute\":\"guest-set-time\"= }\n", size=3D) at ../qobject/json-streamer.c:121 #10 0x000000000cd361fc in channel_event_cb (condition=3D, da= ta=3D0xf3c711a79000) at ../qga/main.c:703 #11 0x000000000cd3710c in ga_channel_client_event (channel=3D, condition=3D, data=3D0xf3c711b2d300) at ../qga/channel-posix.c:94 #12 0x0000f3c7120d9bec in g_main_dispatch () from /usr/pkg/lib/libglib-2.0.= so.0 #13 0x0000f3c7120dd25c in g_main_context_iterate_unlocked.constprop () from= /usr/pkg/lib/libglib-2.0.so.0 #14 0x0000f3c7120ddbf0 in g_main_loop_run () from /usr/pkg/lib/libglib-2.0.= so.0 #15 0x000000000cda00d8 in run_agent_once (s=3D0xf3c711a79000) at ../qga/mai= n.c:1522 #16 run_agent (s=3D0xf3c711a79000) at ../qga/main.c:1559 #17 main (argc=3D, argv=3D) at ../qga/main.c:= 1671 (gdb) The commandline options used on the host machine... qemu-system-aarch64 \ -machine type=3Dvirt,pflash0=3Drom \ -m 8G \ -cpu host \ -smp 8 \ -accel hvf \ -device virtio-net-pci,netdev=3Dunet \ -device virtio-blk-pci,drive=3Dhd \ -drive file=3Dnetbsd.qcow2,if=3Dnone,id=3Dhd \ -netdev user,id=3Dunet,hostfwd=3Dtcp::2223-:22 \ -object rng-random,filename=3D/dev/urandom,id=3Dviornd0 \ -device virtio-rng-pci,rng=3Dviornd0 \ -serial mon:stdio \ -display none \ -blockdev node-name=3Drom,driver=3Dfile,filename=3D/opt/homebrew/Cellar/= qemu/9.0.2/share/qemu/edk2-aarch64-code.fd,read-only=3Dtrue \ -chardev socket,path=3D/tmp/qga_netbsd.sock,server=3Don,wait=3Doff,id=3D= qga0 \ -device virtio-serial \ -device virtconsole,chardev=3Dqga0,name=3Dorg.qemu.guest_agent.0 This patch rectifies the operator precedence while assigning the NUL terminator. Fixes: c3f32c13a325f1ca9a0b08c19fefe9e5cc04289d Signed-off-by: Sunil Nimmagadda Reviewed-by: Konstantin Kostiuk Reviewed-by: Daniel P. Berrang=C3=A9 Link: https://lore.kernel.org/r/m15xppk9qg.fsf@nimmagadda.net Signed-off-by: Konstantin Kostiuk --- qga/commands-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 389c5eeb5d..636307bedf 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -84,7 +84,7 @@ static ssize_t ga_pipe_read_str(int fd[2], char **str) *str =3D g_realloc(*str, len + n + 1); memcpy(*str + len, buf, n); len +=3D n; - *str[len] =3D '\0'; + (*str)[len] =3D '\0'; } close(fd[0]); fd[0] =3D -1; --=20 2.47.0