From nobody Thu Apr 2 23:57:12 2026 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=1774526002; cv=none; d=zohomail.com; s=zohoarc; b=PZLKmWOftB69MgcJxdqBnLItpS7/1xUTPQR5yja7k3r9so46u+9fkw+7UJ0UjnkuZPPvSXHa3F6qwyjWFqxZlPu3tfirQqgFps88wXEGPW+18DOgdSMImIfISqGauXCDKS47GShYH7N360TPqDumXPYt75m0MqxYlAIm2E0RhIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774526002; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=fCvdxbaLYoMhJhtLScrWZp51L4EVjBqLEwdOA6ZAIrI=; b=JpQleUFa3iK3rQ4JwRw2dmLNu3I4rFFlxVxonKlZF5GDvTJ62ifDqRe7s+TwNlVjHJCsFBkjk+PfATMN2oYwDmgliyUjeXXWBL51jezd5GroOG9wirxEeSOHDkUSULrpglcfMr3H/AJ6nKAF6CvGwMlaDZynzZaSLoCBpHv5O0A= 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 1774526002265570.8838501458505; Thu, 26 Mar 2026 04:53:22 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7B5F23F86B; Thu, 26 Mar 2026 07:53:21 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 6932C4194A; Thu, 26 Mar 2026 07:51:40 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 450FA3F2F8; Thu, 26 Mar 2026 07:51:33 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 C2BA73F309 for ; Thu, 26 Mar 2026 07:51:32 -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-178-QXYa7Vs2M6Sw535FboAtYQ-1; Thu, 26 Mar 2026 07:51:31 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 6837418005BE for ; Thu, 26 Mar 2026 11:51:30 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C55731955D71 for ; Thu, 26 Mar 2026 11:51:29 +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=-4.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,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=1774525892; 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=fCvdxbaLYoMhJhtLScrWZp51L4EVjBqLEwdOA6ZAIrI=; b=iz9dC+zR+hTpt26CB/wmy87lr5PR4xbMBdtVBqffGQ6QGmYol69ann1F16hbJR0v+kPN6y htgmrChTppYrwYVGmmJWbpVtiYJuvAWFvjiIufBi/sCoYVcAr9A58nRJK70RgyE2UERIqm ytPZJJOGR2uZTc0yqdEKEtqcte+K6WU= X-MC-Unique: QXYa7Vs2M6Sw535FboAtYQ-1 X-Mimecast-MFC-AGG-ID: QXYa7Vs2M6Sw535FboAtYQ_1774525890 To: devel@lists.libvirt.org Subject: [PATCH 2/3] security: Rewrite virSecurityManagerCheckModel() to use g_autofree Date: Thu, 26 Mar 2026 12:51:24 +0100 Message-ID: <1c2e81430dd5623ab65f4262b4d62c878a24482a.1774525799.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: OJSWnQj5TQVDQoYH7Vw57mzNIEsJWN6QfNSbFPw7pKM_1774525890 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LDMS3QIMGPMNY2YKCT2M5LYPSTFITNNB X-Message-ID-Hash: LDMS3QIMGPMNY2YKCT2M5LYPSTFITNNB X-MailFrom: mprivozn@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 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: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1774526002873158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Let's use automatic memory freeing inside of virSecurityManagerCheckModel() as it will simplify future commits. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/security/security_manager.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/security/security_manager.c b/src/security/security_manage= r.c index 5fc4eb4872..f2f3bb4f19 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -729,9 +729,8 @@ virSecurityManagerReleaseLabel(virSecurityManager *mgr, static int virSecurityManagerCheckModel(virSecurityManager *mgr, char *secmodel) { - int ret =3D -1; + g_autofree virSecurityManager **sec_managers =3D NULL; size_t i; - virSecurityManager **sec_managers =3D NULL; =20 if (STREQ_NULLABLE(secmodel, "none")) return 0; @@ -741,17 +740,14 @@ static int virSecurityManagerCheckModel(virSecurityMa= nager *mgr, =20 for (i =3D 0; sec_managers[i]; i++) { if (STREQ_NULLABLE(secmodel, sec_managers[i]->drv->name)) { - ret =3D 0; - goto cleanup; + return 0; } } =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Security driver model '%1$s' is not available"), secmodel); - cleanup: - VIR_FREE(sec_managers); - return ret; + return -1; } =20 =20 --=20 2.52.0