From nobody Tue Sep 9 19:23:51 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=1753104217; cv=none; d=zohomail.com; s=zohoarc; b=MV0yyHVcWYwUxO4oKcKhT9OIN9FU9SGfWa3960QjA7gqZ1rHrgOOD5VvMtjOrVhjUPDsJsrdxMebh6tHAzyd7jJiOuTy6vAO7tjiF2pOji89azuqSNIVVRmbVVaYb3tu0PnU7/JliVfk0Lj9ud1eiAfwVpiDhpdpBioiYPUnNvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753104217; 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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=JUMI2e0AtdH/Q0KuV5k9gnsVRiQ9/dy0XmKhtOewKT4=; b=RDIVroliZ8KVPm5pTpax+bH9WK4VUYT3J272BoqkzvQqR4EhA/ZHNrTm1qgBw0kH3HSVZ/517f2BO048ctaHJgYimd0OVtK4f9orwGbCu3kMYlYQsGljYJb6EdnXohls66yRmzVixbAKo5hVmJ/ZIQXI2XGdXn5+idg4CVaNTpI= 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 1753104217458721.9861486083303; Mon, 21 Jul 2025 06:23:37 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 708491211; Mon, 21 Jul 2025 09:23:36 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 508ED12A9; Mon, 21 Jul 2025 09:21:26 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7D4D1DF1; Mon, 21 Jul 2025 09:21:12 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0BA4CD4D for ; Mon, 21 Jul 2025 09:21:12 -0400 (EDT) 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-518-ikfsiJo0MMuS9vznBG-mJQ-1; Mon, 21 Jul 2025 09:21:10 -0400 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 6C8691800282 for ; Mon, 21 Jul 2025 13:21:09 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.25]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B095418002B6 for ; Mon, 21 Jul 2025 13:21:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1753104071; 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=X1wVUYnwiauQqq3jMLZZRY9Bo9hNQ5zO60+67pO80yA=; b=MeymA4n0wtIwgnlkGICcZnRH67jjbhKEbrr1uIhv+hwf2gCCAuKiutidF+ahrv4uCZJ/Tb /8wTOh2wtoQY7S8e80kgsFYO7dkG8HZniZdm4dS1fetxZYHx2qCGoRRN0i4YeJSdmNg4KC G/JZf4Uc9GMDM8glTiRMi9zmcA91W34= X-MC-Unique: ikfsiJo0MMuS9vznBG-mJQ-1 X-Mimecast-MFC-AGG-ID: ikfsiJo0MMuS9vznBG-mJQ_1753104069 To: devel@lists.libvirt.org Subject: [PATCH 05/19] virSecuritySELinux(Set|Restore)TPMFileLabel: Automatically free 'cancel_path' Date: Mon, 21 Jul 2025 15:20:46 +0200 Message-ID: In-Reply-To: References: 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: 9GFIw8tThGoOaXN1YktoIV4l9JQ3cUZM19Rtb2MAqC0_1753104069 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7LR2YI4HQ246MB5KHJ7WA7QZO2F7W7H4 X-Message-ID-Hash: 7LR2YI4HQ246MB5KHJ7WA7QZO2F7W7H4 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1753104219762116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Signed-off-by: Peter Krempa --- src/security/security_selinux.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 75ad5803a9..f042da4a13 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1737,7 +1737,7 @@ virSecuritySELinuxSetTPMFileLabel(virSecurityManager = *mgr, { int rc; virSecurityLabelDef *seclabel; - char *cancel_path; + g_autofree char *cancel_path =3D NULL; const char *tpmdev; seclabel =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAM= E); @@ -1755,7 +1755,6 @@ virSecuritySELinuxSetTPMFileLabel(virSecurityManager = *mgr, rc =3D virSecuritySELinuxSetFilecon(mgr, cancel_path, seclabel->imagelabel, false); - VIR_FREE(cancel_path); if (rc < 0) { virSecuritySELinuxRestoreTPMFileLabelInt(mgr, def, tpm); return -1; @@ -1786,7 +1785,7 @@ virSecuritySELinuxRestoreTPMFileLabelInt(virSecurityM= anager *mgr, { int rc =3D 0; virSecurityLabelDef *seclabel; - char *cancel_path; + g_autofree char *cancel_path =3D NULL; const char *tpmdev; seclabel =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAM= E); @@ -1801,7 +1800,6 @@ virSecuritySELinuxRestoreTPMFileLabelInt(virSecurityM= anager *mgr, if ((cancel_path =3D virTPMCreateCancelPath(tpmdev)) !=3D NULL) { if (virSecuritySELinuxRestoreFileLabel(mgr, cancel_path, false= ) < 0) rc =3D -1; - VIR_FREE(cancel_path); } break; case VIR_DOMAIN_TPM_TYPE_EMULATOR: --=20 2.50.0