From nobody Tue Sep 9 19:04:46 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=1753104293; cv=none; d=zohomail.com; s=zohoarc; b=kA05J2xvNjHkvohkaNnwzt+7MRASFZV1gYE5BoPbVu3mVSrNhN04wa8ijMEsGYfEawzspnzbHmwvjE8TS1hd5yNGRDY46D19PC3YLSdf6wGahz2TLJVYDqji27wVR16JEkHRPCdZZk1lxMUzkcfMz+GJqvwp7MJa8Ku2PrRvVRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753104293; 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=pJcMYVvi5Ybb3yfrhQtMPRxaJs0BSkKNeTaf8ePn4rQ=; b=cWVuyoMwc5Y17gAEK6RVfRSXkJ2prIbPF234Fd0c1AGDDTWhfupRw6VkuaCca1hrpetgU5rBm8ByDQvif59rfEcbUuFVC9DKETG/3is4dCABgpQ2JeV9m0B8EtvAAXHTsMfzKwjkMmIeLzZ0vguCJbwBKFdhFrZvKF/RWwA3Ujo= 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 1753104293922445.48554352563553; Mon, 21 Jul 2025 06:24:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E4E531482; Mon, 21 Jul 2025 09:24:52 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 27C3E110C; Mon, 21 Jul 2025 09:21:35 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CF024E78; Mon, 21 Jul 2025 09:21:27 -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 0F19312C1 for ; Mon, 21 Jul 2025 09:21:17 -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-80-jawFtuRnOJel06TmQok7fg-1; Mon, 21 Jul 2025 09:21:14 -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 115621800282 for ; Mon, 21 Jul 2025 13:21:13 +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 4FE8E18002B6 for ; Mon, 21 Jul 2025 13:21:12 +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=1753104076; 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=uZuKuDPWG/4gXLxuqsBXq3GNSIQZJzJjqRhSMJjGi9k=; b=ipNnk8q/6Q9LOoA1lSbFkrPBMGlvrMY7ww8IER4ynEM/wnVJgygPaoLgBtpLtEWitShi1K amMWmKQAM78UMj1/ka6cbubdzp82vDdKYUR0O4WTsE/jwGIyEvG61cuU1t2qrN55Kigr3N /w21axTlx2T7kKa/oa8Uu9Uabgve2vM= X-MC-Unique: jawFtuRnOJel06TmQok7fg-1 X-Mimecast-MFC-AGG-ID: jawFtuRnOJel06TmQok7fg_1753104073 To: devel@lists.libvirt.org Subject: [PATCH 08/19] virSecuritySELinux(Set|Restore)ChardevLabel: Refactor cleanup Date: Mon, 21 Jul 2025 15:20:49 +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: SK11Sn09KUmmnCQp8_nNZOyVQArWoMAnPql0mkabPWo_1753104073 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FS3OXNOHDYRJ2TQ7OQAYUFWLTHR4NTP3 X-Message-ID-Hash: FS3OXNOHDYRJ2TQ7OQAYUFWLTHR4NTP3 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: 1753104295254116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Declare 'in'/'out' only in the bocks which use them and automatically free them. Since cleanup section was removed we don't need a 'ret' variable any more. Signed-off-by: Peter Krempa --- src/security/security_selinux.c | 87 +++++++++++++++------------------ 1 file changed, 40 insertions(+), 47 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 2cdc6bf954..25f0c45955 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2667,8 +2667,6 @@ virSecuritySELinuxSetChardevLabel(virSecurityManager = *mgr, virSecurityLabelDef *seclabel; virSecurityDeviceLabelDef *chr_seclabel =3D NULL; char *imagelabel =3D NULL; - char *in =3D NULL, *out =3D NULL; - int ret =3D -1; seclabel =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAM= E); if (!seclabel || !seclabel->relabel) @@ -2693,10 +2691,12 @@ virSecuritySELinuxSetChardevLabel(virSecurityManage= r *mgr, switch (dev_source->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: - ret =3D virSecuritySELinuxSetFilecon(mgr, - dev_source->data.file.path, - imagelabel, - true); + if (virSecuritySELinuxSetFilecon(mgr, + dev_source->data.file.path, + imagelabel, + true) < 0) + return -1; + break; case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -2710,37 +2710,35 @@ virSecuritySELinuxSetChardevLabel(virSecurityManage= r *mgr, dev_source->data.nix.path, imagelabel, true) < 0) - goto done; + return -1; } - ret =3D 0; + break; - case VIR_DOMAIN_CHR_TYPE_PIPE: - in =3D g_strdup_printf("%s.in", dev_source->data.file.path); - out =3D g_strdup_printf("%s.out", dev_source->data.file.path); + case VIR_DOMAIN_CHR_TYPE_PIPE: { + g_autofree char *in =3D g_strdup_printf("%s.in", dev_source->data.= file.path); + g_autofree char *out =3D g_strdup_printf("%s.out", dev_source->dat= a.file.path); if (virFileExists(in) && virFileExists(out)) { if ((virSecuritySELinuxSetFilecon(mgr, in, imagelabel, true) <= 0) || - (virSecuritySELinuxSetFilecon(mgr, out, imagelabel, true) = < 0)) { - goto done; - } - } else if (virSecuritySELinuxSetFilecon(mgr, - dev_source->data.file.path, - imagelabel, - true) < 0) { - goto done; + (virSecuritySELinuxSetFilecon(mgr, out, imagelabel, true) = < 0)) + return -1; + + } else { + if (virSecuritySELinuxSetFilecon(mgr, + dev_source->data.file.path, + imagelabel, + true) < 0) + return -1; } - ret =3D 0; + break; + } default: - ret =3D 0; break; } - done: - VIR_FREE(in); - VIR_FREE(out); - return ret; + return 0; } static int @@ -2752,8 +2750,6 @@ virSecuritySELinuxRestoreChardevLabel(virSecurityMana= ger *mgr, { virSecurityLabelDef *seclabel; virSecurityDeviceLabelDef *chr_seclabel =3D NULL; - char *in =3D NULL, *out =3D NULL; - int ret =3D -1; seclabel =3D virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAM= E); if (!seclabel || !seclabel->relabel) @@ -2775,8 +2771,8 @@ virSecuritySELinuxRestoreChardevLabel(virSecurityMana= ger *mgr, if (virSecuritySELinuxRestoreFileLabel(mgr, dev_source->data.file.path, true) < 0) - goto done; - ret =3D 0; + return -1; + break; case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -2784,36 +2780,33 @@ virSecuritySELinuxRestoreChardevLabel(virSecurityMa= nager *mgr, if (virSecuritySELinuxRestoreFileLabel(mgr, dev_source->data.nix.pa= th, true) < 0) - goto done; + return -1; } - ret =3D 0; + break; - case VIR_DOMAIN_CHR_TYPE_PIPE: - out =3D g_strdup_printf("%s.out", dev_source->data.file.path); - in =3D g_strdup_printf("%s.in", dev_source->data.file.path); + case VIR_DOMAIN_CHR_TYPE_PIPE: { + g_autofree char *out =3D g_strdup_printf("%s.out", dev_source->dat= a.file.path); + g_autofree char *in =3D g_strdup_printf("%s.in", dev_source->data.= file.path); if (virFileExists(in) && virFileExists(out)) { if ((virSecuritySELinuxRestoreFileLabel(mgr, out, true) < 0) || - (virSecuritySELinuxRestoreFileLabel(mgr, in, true) < 0)) { - goto done; - } - } else if (virSecuritySELinuxRestoreFileLabel(mgr, - dev_source->data.fil= e.path, - true) < 0) { - goto done; + (virSecuritySELinuxRestoreFileLabel(mgr, in, true) < 0)) + return -1; + + } else { + if (virSecuritySELinuxRestoreFileLabel(mgr, + dev_source->data.file.p= ath, + true) < 0) + return -1; } - ret =3D 0; + } break; default: - ret =3D 0; break; } - done: - VIR_FREE(in); - VIR_FREE(out); - return ret; + return 0; } --=20 2.50.0