From nobody Tue Sep 9 03:20:57 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=1749732911; cv=none; d=zohomail.com; s=zohoarc; b=cqM6DpUUwNWpVQ0D9RdWbnoG2Ap5UQfeYjNXAixIDQRb7v4IfouZSqhieJUakHdUDGMPS9cXzMj9kx/jumcKfuyub1Ume5ip+S2k3vhz47ROAN/Mlp1JzD0/wRADuYUUdLKOpXEMUmLo1EPox1I9cALPSyBaaysCWwGQbmoqIyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749732911; 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=2fsncybPk9+KjL7+K8DXlUUOKC9meDNlDIPZMflhhZU=; b=A7IaSviL8fNiWGfTs0MR1Vbj5DUUXSWf2uTZjIm3hJCpciLalzEtiwqBLN0wdj8mVEzsV8BHFsHaj1q10r0qgLik/4NHdgB5655Qbs7I+z6/Y03EjpltYIu+QRSvXVMugEDfVMGGk09h+Mjcx5lVeQR+7ZtJBf5+mJ5K8Ky+TD0= 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 17497329112095.961650074639692; Thu, 12 Jun 2025 05:55:11 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 291C91281; Thu, 12 Jun 2025 08:55:10 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E962210F4; Thu, 12 Jun 2025 08:49:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C1E55E76; Thu, 12 Jun 2025 08:49:28 -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 AED60E76 for ; Thu, 12 Jun 2025 08:49: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-209-H538btBXOs6kzeMuO2wsDA-1; Thu, 12 Jun 2025 08:49:07 -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 14D7B180028E for ; Thu, 12 Jun 2025 12:49:07 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.3.236]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5D47719560A3 for ; Thu, 12 Jun 2025 12:49: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, 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=1749732549; 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=r74RNd3hS4OoZ8AmlnbVXWUZscxkipHGZ2akleFfTac=; b=Ka4Zcj4GrpeJfA51ZPP6Qs+5Hc89zgE8emAby648S1/LnidtXfnfV6937VgVSethUSco38 agb8zBcSG+Ih2bRm96lYiCwz7ONhMy7Ei37ehmhamyDqakgI0cA60/MNK/NBrXM9QuSQkC IkZ/V3Q+/bA97mWX0d3HbTRjvqkhomI= X-MC-Unique: H538btBXOs6kzeMuO2wsDA-1 X-Mimecast-MFC-AGG-ID: H538btBXOs6kzeMuO2wsDA_1749732547 To: devel@lists.libvirt.org Subject: [PATCH 14/15] virt-aa-helper: Drop cleanup label from get_files() Date: Thu, 12 Jun 2025 14:48:46 +0200 Message-ID: <3b3d8ce8a2b3c46098e1e2aa0485a77c66746325.1749732372.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: G_QnP0Uwd3CdPpEr7x2njQi7n9eWeFhE8z8V9oXXH8c_1749732547 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TKIQVWTXNUCT2VTR5ZPFRT263L275TBA X-Message-ID-Hash: TKIQVWTXNUCT2VTR5ZPFRT263L275TBA X-MailFrom: mprivozn@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: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1749732912841116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik After previous cleanup the cleanup label is no longer necessary. Drop it. Signed-off-by: Michal Privoznik --- src/security/virt-aa-helper.c | 120 ++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 7748a0d19b..b662d971cb 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -863,7 +863,7 @@ static int get_files(vahControl * ctl) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - int rc =3D -1; + int rc; size_t i; g_autofree char *uuid =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -875,7 +875,7 @@ get_files(vahControl * ctl) =20 if (STRNEQ(uuid, ctl->uuid)) { vah_error(ctl, 0, _("given uuid does not match XML uuid")); - goto cleanup; + return -1; } =20 /* load the storage driver so that backing store can be accessed */ @@ -900,7 +900,7 @@ get_files(vahControl * ctl) /* XXX should handle open errors more careful than just ignoring = them. */ if (storage_source_add_files(disk->src, &buf, 0) < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < ctl->def->nserials; i++) { @@ -917,7 +917,7 @@ get_files(vahControl * ctl) chr->source->data.file.path, "rw", chr->source->type) !=3D 0) { - goto cleanup; + return -1; } } } @@ -934,7 +934,7 @@ get_files(vahControl * ctl) chr->source->data.file.path[0] !=3D '\0') { if (vah_add_file(&buf, chr->source->data.file.path, "rw") !=3D 0) { - goto cleanup; + return -1; } } } @@ -953,7 +953,7 @@ get_files(vahControl * ctl) chr->source->data.file.path, "rw", chr->source->type) !=3D 0) { - goto cleanup; + return -1; } } } @@ -972,48 +972,54 @@ get_files(vahControl * ctl) chr->source->data.file.path, "rw", chr->source->type) !=3D 0) { - goto cleanup; + return -1; } } } =20 - if (ctl->def->os.kernel) - if (vah_add_file(&buf, ctl->def->os.kernel, "r") !=3D 0) - goto cleanup; + if (ctl->def->os.kernel && + vah_add_file(&buf, ctl->def->os.kernel, "r") !=3D 0) { + return -1; + } =20 - if (ctl->def->os.initrd) - if (vah_add_file(&buf, ctl->def->os.initrd, "r") !=3D 0) - goto cleanup; + if (ctl->def->os.initrd && + vah_add_file(&buf, ctl->def->os.initrd, "r") !=3D 0) { + return -1; + } =20 - if (ctl->def->os.shim) - if (vah_add_file(&buf, ctl->def->os.shim, "r") !=3D 0) - goto cleanup; + if (ctl->def->os.shim && + vah_add_file(&buf, ctl->def->os.shim, "r") !=3D 0) { + return -1; + } =20 - if (ctl->def->os.dtb) - if (vah_add_file(&buf, ctl->def->os.dtb, "r") !=3D 0) - goto cleanup; + if (ctl->def->os.dtb && + vah_add_file(&buf, ctl->def->os.dtb, "r") !=3D 0) { + return -1; + } =20 for (i =3D 0; i < ctl->def->os.nacpiTables; i++) { if (vah_add_file(&buf, ctl->def->os.acpiTables[i]->path, "r") !=3D= 0) - goto cleanup; + return -1; } =20 - if (ctl->def->pstore) - if (vah_add_file(&buf, ctl->def->pstore->path, "rw") !=3D 0) - goto cleanup; + if (ctl->def->pstore && + vah_add_file(&buf, ctl->def->pstore->path, "rw") !=3D 0) { + return -1; + } =20 if (ctl->def->os.loader && ctl->def->os.loader->path) { bool readonly =3D false; virTristateBoolToBool(ctl->def->os.loader->readonly, &readonly); if (vah_add_file(&buf, ctl->def->os.loader->path, - readonly ? "rk" : "rwk") !=3D 0) - goto cleanup; + readonly ? "rk" : "rwk") !=3D 0) { + return -1; + } } =20 - if (ctl->def->os.loader && ctl->def->os.loader->nvram) { - if (storage_source_add_files(ctl->def->os.loader->nvram, &buf, 0) = < 0) - goto cleanup; + if (ctl->def->os.loader && ctl->def->os.loader->nvram && + storage_source_add_files(ctl->def->os.loader->nvram, &buf, 0) < 0)= { + return -1; } =20 for (i =3D 0; i < ctl->def->ngraphics; i++) { @@ -1023,7 +1029,7 @@ get_files(vahControl * ctl) =20 if (rendernode) { if (vah_add_file(&buf, rendernode, "rw") !=3D 0) - goto cleanup; + return -1; needsgl =3D true; } else { if (virDomainGraphicsNeedsAutoRenderNode(graphics)) { @@ -1032,7 +1038,7 @@ get_files(vahControl * ctl) =20 if (defaultRenderNode && vah_add_file(&buf, defaultRenderNode, "rw") !=3D 0) { - goto cleanup; + return -1; } } } @@ -1043,15 +1049,15 @@ get_files(vahControl * ctl) if (listenObj.type =3D=3D VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCK= ET && listenObj.socket && vah_add_file(&buf, listenObj.socket, "rw")) - goto cleanup; + return -1; } } =20 if (ctl->def->ngraphics =3D=3D 1 && - ctl->def->graphics[0]->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_SDL) - if (vah_add_file(&buf, ctl->def->graphics[0]->data.sdl.xauth, - "r") !=3D 0) - goto cleanup; + ctl->def->graphics[0]->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_SDL && + vah_add_file(&buf, ctl->def->graphics[0]->data.sdl.xauth, "r") != =3D 0) { + return -1; + } =20 for (i =3D 0; i < ctl->def->nhostdevs; i++) { virDomainHostdevDef *dev =3D ctl->def->hostdevs[i]; @@ -1071,7 +1077,7 @@ get_files(vahControl * ctl) =20 rc =3D virUSBDeviceFileIterate(usb, file_iterate_hostdev_cb, &= buf); if (rc !=3D 0) - goto cleanup; + return -1; break; } =20 @@ -1132,7 +1138,7 @@ get_files(vahControl * ctl) * this can only lead to troubles when mounting / readonly. */ if (vah_add_path(&buf, fs->src->path, fs->readonly ? "R" : "rw= l", true) !=3D 0) - goto cleanup; + return -1; } } =20 @@ -1142,7 +1148,7 @@ get_files(vahControl * ctl) if (input->type =3D=3D VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH || input->type =3D=3D VIR_DOMAIN_INPUT_TYPE_EVDEV) { if (vah_add_file(&buf, ctl->def->inputs[i]->source.evdev, "rw"= ) !=3D 0) - goto cleanup; + return -1; } } =20 @@ -1155,7 +1161,7 @@ get_files(vahControl * ctl) =20 if (vah_add_file_chardev(&buf, vhu->data.nix.path, "rw", vhu->type) !=3D 0) - goto cleanup; + return -1; } } =20 @@ -1165,16 +1171,16 @@ get_files(vahControl * ctl) switch (mem->model) { case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: if (vah_add_file(&buf, mem->source.nvdimm.path, "rw") !=3D 0) - goto cleanup; + return -1; break; case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: if (vah_add_file(&buf, mem->source.virtio_pmem.path, "rw") != =3D 0) - goto cleanup; + return -1; break; case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: if (vah_add_file(&buf, DEV_SGX_VEPC, "rw") !=3D 0 || vah_add_file(&buf, DEV_SGX_PROVISION, "r") !=3D 0) { - goto cleanup; + return -1; } break; =20 @@ -1195,7 +1201,7 @@ get_files(vahControl * ctl) =20 if (f->file && vah_add_file(&buf, f->file, "r") !=3D 0) - goto cleanup; + return -1; } } =20 @@ -1206,9 +1212,9 @@ get_files(vahControl * ctl) * model dependent defaults. */ if (shmem->server.enabled && shmem->server.chr->data.nix.path) { - if (vah_add_file(&buf, shmem->server.chr->data.nix.path, - "rw") !=3D 0) - goto cleanup; + if (vah_add_file(&buf, shmem->server.chr->data.nix.path, + "rw") !=3D 0) + return -1; } else { g_autofree char *mem_path =3D NULL; =20 @@ -1219,18 +1225,18 @@ get_files(vahControl * ctl) break; case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_DOORBELL: case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM: - /* until exposed, recreate qemuDomainPrepareShmemChardev = */ + /* until exposed, recreate qemuDomainPrepareShmemChardev */ mem_path =3D g_strdup_printf("/var/lib/libvirt/shmem-%s-so= ck", - shmem->name); + shmem->name); break; case VIR_DOMAIN_SHMEM_MODEL_LAST: virReportEnumRangeError(virDomainShmemModel, shmem->model); break; } - if (mem_path !=3D NULL) { - if (vah_add_file(&buf, mem_path, "rw") !=3D 0) - goto cleanup; + if (mem_path !=3D NULL && + vah_add_file(&buf, mem_path, "rw") !=3D 0) { + return -1; } } } @@ -1353,15 +1359,13 @@ get_files(vahControl * ctl) virBufferAddLit(&buf, " deny \"/var/lib/libvirt/.cache/\" w,\n"); } =20 - if (ctl->newfile) - if (vah_add_file(&buf, ctl->newfile, "rwk") !=3D 0) - goto cleanup; + if (ctl->newfile && + vah_add_file(&buf, ctl->newfile, "rwk") !=3D 0) { + return -1; + } =20 - rc =3D 0; ctl->files =3D virBufferContentAndReset(&buf); - - cleanup: - return rc; + return 0; } =20 static int --=20 2.49.0