From nobody Wed Mar 12 17:58:40 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741694390853572.6635082191923; Tue, 11 Mar 2025 04:59:50 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4C5691C9E; Tue, 11 Mar 2025 07:59:46 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F03431CC7; Tue, 11 Mar 2025 07:59:14 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6A5AE1BA2; Tue, 11 Mar 2025 07:59:10 -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 E6C471B9C for ; Tue, 11 Mar 2025 07:59:09 -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-155-lm9CNvT2M8GTr302O-VtVg-1; Tue, 11 Mar 2025 07:59:08 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 82D1C180025E for ; Tue, 11 Mar 2025 11:59:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.2]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8472519560AB for ; Tue, 11 Mar 2025 11:59:06 +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, HEADER_FROM_DIFFERENT_DOMAINS,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_NONE 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=1741694349; 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=+7wcoiBiPZ0IRwRpCuHSwm8j7oAP7zFE1fYnvfNEWKM=; b=Vya+gQPqB8FBuNTz/CpMKafI4yI2m2X/ZOGu7JkCETRkL4Uhk74dprEJeWfOPJXtk9jdjw k3qBLFkqbHFbWhT5x/sQeBAi2rRadtHF46GE9QrUUvrcjK1WUv58RMTZyBdhIxpg18w1ZS ID5ELHo/ZyGw7gHvwC2Px6OmNp6OBh8= X-MC-Unique: lm9CNvT2M8GTr302O-VtVg-1 X-Mimecast-MFC-AGG-ID: lm9CNvT2M8GTr302O-VtVg_1741694347 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 1/3] qemuDomainGetLaunchSecurityInfo: Don't forget unlock VM object on (impossible) error Date: Tue, 11 Mar 2025 12:59:01 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Is7aM4usvOk5pVFLE_CAPf3FOHkutQc5K9WAmTyvHXg_1741694347 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QSY4N6IRWABW2AIE5AKEFZTJH3FZBBKS X-Message-ID-Hash: QSY4N6IRWABW2AIE5AKEFZTJH3FZBBKS 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741694392456019000 Content-Type: text/plain; charset="utf-8" If 'vm->def->sec->sectype' would be invalid; which is currently not possible; we'd not unlock the domain object. Fix the logic even when the bug currently can't happen. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a5122d0cd6..45bb3c09aa 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19056,7 +19056,7 @@ qemuDomainGetLaunchSecurityInfo(virDomainPtr domain, case VIR_DOMAIN_LAUNCH_SECURITY_NONE: case VIR_DOMAIN_LAUNCH_SECURITY_LAST: virReportEnumRangeError(virDomainLaunchSecurity, vm->def->sec->sec= type); - return -1; + goto cleanup; } ret =3D 0; --=20 2.48.1