From nobody Mon Feb 9 05:06:17 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=1725719567; cv=none; d=zohomail.com; s=zohoarc; b=LFgf8M/WsHo/lAM2ulpZO37JW3KWE6RbDEStu8nFH7ZrA9gjy0sRqN3D9svKE0zYgVTA/h4pqSm62mwb4kEy66FD9VtnzmA2iIq6xsIvLxjywTq+5g6TyjU8kjp+V7hte+DMcOrhEQJoqtYK1CjvhvpqRXnIa6IBIGlBz1kkYlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725719567; h=Content-Transfer-Encoding:Cc:Cc: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; bh=T89PsnfgDmgLBjcahSydThoLt7lYsFBwWbuZO9+monI=; b=m6H1gOYrKEuRNmj1wsAOFAH7nUDppHf5Rea3QyQx/ioSFU7ykuF/qcIe3yHLUQAsDNebTecgRZRpAsu6KnHkgL7MZqb1UMcM/R4hmadhgcG4QLG0On3IuZ09Ch2/3rSSajrMA6ljTpxnJK9qkthyoTwHFdIEVBjd400atwY05D4= 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 1725719567383886.7282645984134; Sat, 7 Sep 2024 07:32:47 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4E2C418C7; Sat, 7 Sep 2024 10:32:46 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8876D18D0; Sat, 7 Sep 2024 10:31:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3AAF018DA; Sat, 7 Sep 2024 10:31:50 -0400 (EDT) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) (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 83CCF190F for ; Sat, 7 Sep 2024 10:31:30 -0400 (EDT) Received: from [130.117.225.1] (helo=vz9-barybin-2.ch-qa.vzint.dev) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1smwQn-001ZxE-2G; Sat, 07 Sep 2024 16:31:24 +0200 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=Pa6U8aomxUIRPRWH0RPckYFmQd3ATX0zxTLFM4u11oE=; b=be4xXa/SiEHj lB4TohyZkB1xeypJ4N6vDcWwQu7QzuFgs5X7gdktoZN8L/gQEKtUVpnyftsgTiwDJRDvsag/974B6 XeclPJplAVzaNJQxS8bWJgWttlqzK9Oxp9guG6WOiDWrO8Yvz0jTBpqW/x4DWquG/7oUtVczLRr8J +0l2DnwwcPG6zuLMKl+rXcoIb5mnt8/wCN0GTVV0eWdHesaG9i2wlgeL3tIufp19ir0Ck+0o4Fjwy Y3NA0B5HNjG14kF0nKWfh713idN2b6hPdynYuEg3J61Snkh4ccHogbAS2yRH8843C00/24OTwoma/ 7Ic1qADw2/nBM+bb8jqYxA==; To: devel@lists.libvirt.org Subject: [PATCH v2 05/13] security: DAC: handle qcow2 data-file on image label set/restore Date: Sat, 7 Sep 2024 17:15:25 +0300 Message-ID: <20240907143006.50677-11-nikolai.barybin@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20240907143006.50677-1-nikolai.barybin@virtuozzo.com> References: <20240907143006.50677-1-nikolai.barybin@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TSRJJ3IWPF3QLLOJXRIXLOR6OJ6E5BRX X-Message-ID-Hash: TSRJJ3IWPF3QLLOJXRIXLOR6OJ6E5BRX X-MailFrom: nikolai.barybin@virtuozzo.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 CC: den@openvz.org, Nikolai Barybin 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: Nikolai Barybin via Devel Reply-To: Nikolai Barybin X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725719568910116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Nikolai Barybin --- src/security/security_dac.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 59fc5b840f..f0dde46e25 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -951,6 +951,10 @@ virSecurityDACSetImageLabel(virSecurityManager *mgr, if (virSecurityDACSetImageLabelInternal(mgr, def, n, parent, isCha= inTop) < 0) return -1; =20 + if (n->dataFileStore && + virSecurityDACSetImageLabelInternal(mgr, def, n->dataFileStore= , n, true) < 0) + return -1; + if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN)) break; =20 @@ -1042,7 +1046,12 @@ virSecurityDACRestoreImageLabel(virSecurityManager *= mgr, virStorageSource *src, virSecurityDomainImageLabelFlags flags G_G= NUC_UNUSED) { - return virSecurityDACRestoreImageLabelInt(mgr, def, src, false); + int rc =3D virSecurityDACRestoreImageLabelInt(mgr, def, src, false); + + if (rc =3D=3D 0 && src->dataFileStore) + rc =3D virSecurityDACRestoreImageLabelInt(mgr, def, src->dataFileS= tore, false); + + return rc; } =20 =20 @@ -1906,10 +1915,17 @@ virSecurityDACRestoreAllLabel(virSecurityManager *m= gr, def->name, migrated); =20 for (i =3D 0; i < def->ndisks; i++) { - if (virSecurityDACRestoreImageLabelInt(mgr, - def, - def->disks[i]->src, - migrated) < 0) + int ret =3D virSecurityDACRestoreImageLabelInt(mgr, + def, + def->disks[i]->src, + migrated); + + if (ret =3D=3D 0 && def->disks[i]->src->dataFileStore) + ret =3D virSecurityDACRestoreImageLabelInt(mgr, + def, + def->disks[i]->src->d= ataFileStore, + migrated); + if (ret < 0) rc =3D -1; } =20 --=20 2.43.5