From nobody Fri Dec 12 14:09:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1764073544; cv=none; d=zohomail.com; s=zohoarc; b=d4yD6eUG9JMH7C3+e8we4Jb7pjyioLj0+Fsxbz0buwNaq1GBCXJd9GbYHUr8VEK2N5SppanXT3VB7R0N2cMhUqM7fRS7jgDbt41IJh4lv9der3ZdIEy/AlAmkuVF/YUqB5AFkylvibkd6qqCatxywfQNuArCoUduDh1QSo0+sEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764073544; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=9nHvf8wQkkXxeOqf/5li3QJOMhQAWorqFT5oHMXIiB8=; b=T199MFa5gxt13lWUYdwkF0K34IdAZE9FcC80QKBrFehb2BBpQ2/sx5y7Clpcpf9g8F77VTiVfv+3ST6Q87K9zSA+SoFEFBICSXT0jTzSoFb5+8b1VUXJIcYwg7ofeOMiiPo8nVxRKRaft4wVrAs98Klg+EKSQaGvPwx30hKjIpA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 176407354441829.548969548240052; Tue, 25 Nov 2025 04:25:44 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id C127444AAC; Tue, 25 Nov 2025 07:25:39 -0500 (EST) Received: from [172.19.199.68] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id AA7F944C1D; Tue, 25 Nov 2025 07:18:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 3A0C944908; Tue, 25 Nov 2025 07:18:36 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 583D7448B2 for ; Tue, 25 Nov 2025 07:18:20 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-695--M6gVbd0Oia3SS0IwT8Kng-1; Tue, 25 Nov 2025 07:18:18 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0A62A180048E for ; Tue, 25 Nov 2025 12:18:18 +0000 (UTC) Received: from kshcheti-thinkpadp1gen4i.tpbc.csb (unknown [10.43.3.229]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3422D1800361; Tue, 25 Nov 2025 12:18:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764073100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9nHvf8wQkkXxeOqf/5li3QJOMhQAWorqFT5oHMXIiB8=; b=WzZYnl6zdUClh0aNY0uUd25H3tyrh3zZsPsp9nEHGAH8B9oRZXZSuwh8i5jTY31ju/EoAT cXWtPituxuRuOjcbzDIXmHzGYugRswXZzAmJ6AY84ixwe4D+Bu87Z7yEwI7Vuzlef1Qxm3 UQ1m3egM0Hivh9OF9+0XC/D5bAiRi9k= X-MC-Unique: -M6gVbd0Oia3SS0IwT8Kng-1 X-Mimecast-MFC-AGG-ID: -M6gVbd0Oia3SS0IwT8Kng_1764073098 To: devel@lists.libvirt.org Subject: [PATCH v2 06/22] qemuDomainMasterKeyReadFile: Use automatic memory management Date: Tue, 25 Nov 2025 13:11:36 +0100 Message-ID: <20251125121753.444490-7-kshcheti@redhat.com> In-Reply-To: <20251125121753.444490-1-kshcheti@redhat.com> References: <20251125121753.444490-1-kshcheti@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Y5fjZoByBarD38yI9jVnT-Uu0fEf9nRZKABzzEzPUkU_1764073098 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SAECFL7HILEANBHKFWKRZC7OTHQYKVTO X-Message-ID-Hash: SAECFL7HILEANBHKFWKRZC7OTHQYKVTO X-MailFrom: kshcheti@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Kirill Shchetiniuk X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Kirill Shchetiniuk via Devel Reply-To: Kirill Shchetiniuk X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1764073546419019200 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Kirill Shchetiniuk Use the automemory management for the master key, use the virSecureErase for safe clear of the key in case of error. Signed-off-by: Kirill Shchetiniuk --- src/qemu/qemu_domain.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ac56fc7cb4..c788eb3e2a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -566,7 +566,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivate *priv) { g_autofree char *path =3D NULL; int fd =3D -1; - uint8_t *masterKey =3D NULL; + g_autofree uint8_t *masterKey =3D NULL; ssize_t masterKeyLen =3D 0; =20 if (!(path =3D qemuDomainGetMasterKeyFilePath(priv->libDir))) @@ -601,7 +601,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivate *priv) =20 masterKey =3D g_renew(uint8_t, masterKey, masterKeyLen); =20 - priv->masterKey =3D masterKey; + priv->masterKey =3D g_steal_pointer(&masterKey); priv->masterKeyLen =3D masterKeyLen; =20 VIR_FORCE_CLOSE(fd); @@ -609,9 +609,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivate *priv) return 0; =20 error: - if (masterKeyLen > 0) - memset(masterKey, 0, masterKeyLen); - VIR_FREE(masterKey); + virSecureErase(masterKey, masterKeyLen); =20 VIR_FORCE_CLOSE(fd); =20 --=20 2.49.0