From nobody Tue Sep 9 19:25:38 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=1753104267; cv=none; d=zohomail.com; s=zohoarc; b=P2McJrKvqVhT4IyQO6LhJnqinaoG7UgzKxt+8rBwOPqxxRiXhjK28gaS0SmCeqlGORlPmuq04lCg3QqYHRsEG13lMgkB7gtqMdEfSnCa/rlQ52aqA56jDbcl1KVtlX9CuXb7kKkN6/Z7qahc8S0PU+MwcLp2pm/Md/xhzP5bGMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753104267; 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=2kiVHj/0mFJnD1QbYblVdfvhckKgtyym9xE0zvduGrM=; b=njgFrZwxvtFA3JaoJpkil65RS8nGADlkTGSYAFxlPjDze6Xj0jk86K4UEnbQRIWAwZ0xd6Wx4NhPm41usAQsrSuWGS3uFgx8nRNlrrtWI3U0kK/fDQ1WC1oCdlJ3hDdLpD4cKom8PWw3TTgmfREy8SXYFsASRIJVocQvwmNRtLQ= 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 1753104267165866.0485876440653; Mon, 21 Jul 2025 06:24:27 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 228E19D2; Mon, 21 Jul 2025 09:24:26 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 355D1146B; Mon, 21 Jul 2025 09:21:32 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BE48410F2; Mon, 21 Jul 2025 09:21:14 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 400E4DF2 for ; Mon, 21 Jul 2025 09:21:14 -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-657-Bj1MJ3LJPh69cawIYpAo-Q-1; Mon, 21 Jul 2025 09:21:12 -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 CD7AC1800281 for ; Mon, 21 Jul 2025 13:21:11 +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 23A9618002B6 for ; Mon, 21 Jul 2025 13:21:10 +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=1753104074; 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=aqgERgi8b80ilY+QxZcgkySriDgNFKNtJlywyvp75m0=; b=Zbm2w4F2F74DMTQXo9hS6KUrLjrhDLI0Vty8NXYerv6rXs9sjzsbi7BnOwKvAS4hh16PI8 hngSL9srnbiWjcGY2F+lv5KQm8KR9FDvMkJ9Pra0Jt64tiFatk6MgjZ4nH1fZk8JhZfpY4 2oLKxkh7ylevnpy0hUO5xknCBnrmu04= X-MC-Unique: Bj1MJ3LJPh69cawIYpAo-Q-1 X-Mimecast-MFC-AGG-ID: Bj1MJ3LJPh69cawIYpAo-Q_1753104071 To: devel@lists.libvirt.org Subject: [PATCH 07/19] virSecuritySELinux(Set|Restore)HostdevCapsLabel: Refactor cleanup Date: Mon, 21 Jul 2025 15:20:48 +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: 4_H2OiSe7MXIRRVC2xNjiRqGqyBx7Sasgdx07BUdhCE_1753104071 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NGEZBFTKZ4T6EDAZFS2RGJSY6RU7LY3K X-Message-ID-Hash: NGEZBFTKZ4T6EDAZFS2RGJSY6RU7LY3K 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: 1753104268379116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Declare 'path' only in blocks where it's used and autofree it. Signed-off-by: Peter Krempa --- src/security/security_selinux.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 854e46954e..2cdc6bf954 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2333,7 +2333,6 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityMana= ger *mgr, { int ret =3D -1; virSecurityLabelDef *secdef; - char *path; secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (secdef =3D=3D NULL) @@ -2341,6 +2340,7 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityMana= ger *mgr, switch (dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { + g_autofree char *path =3D NULL; if (vroot) { path =3D g_strdup_printf("%s/%s", vroot, dev->source.caps.u.storage.block); @@ -2348,11 +2348,11 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityMa= nager *mgr, path =3D g_strdup(dev->source.caps.u.storage.block); } ret =3D virSecuritySELinuxSetFilecon(mgr, path, secdef->imagelabel= , true); - VIR_FREE(path); break; } case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: { + g_autofree char *path =3D NULL; if (vroot) { path =3D g_strdup_printf("%s/%s", vroot, dev->source.caps.u.misc.chardev); @@ -2360,7 +2360,6 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityMana= ger *mgr, path =3D g_strdup(dev->source.caps.u.misc.chardev); } ret =3D virSecuritySELinuxSetFilecon(mgr, path, secdef->imagelabel= , true); - VIR_FREE(path); break; } @@ -2562,10 +2561,10 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecuri= tyManager *mgr, const char *vroot) { int ret =3D -1; - char *path; switch (dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { + g_autofree char *path =3D NULL; if (vroot) { path =3D g_strdup_printf("%s/%s", vroot, dev->source.caps.u.storage.block); @@ -2573,11 +2572,11 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecuri= tyManager *mgr, path =3D g_strdup(dev->source.caps.u.storage.block); } ret =3D virSecuritySELinuxRestoreFileLabel(mgr, path, true); - VIR_FREE(path); break; } case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: { + g_autofree char *path =3D NULL; if (vroot) { path =3D g_strdup_printf("%s/%s", vroot, dev->source.caps.u.misc.chardev); @@ -2585,7 +2584,6 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurity= Manager *mgr, path =3D g_strdup(dev->source.caps.u.misc.chardev); } ret =3D virSecuritySELinuxRestoreFileLabel(mgr, path, true); - VIR_FREE(path); break; } --=20 2.50.0