From nobody Sun Nov 24 10:00:17 2024 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 1722605367662489.14296778361404; Fri, 2 Aug 2024 06:29:27 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5CD7F140B; Fri, 2 Aug 2024 09:29:26 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id AD144147A; Fri, 2 Aug 2024 09:24:24 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id ABD5214BA; Fri, 2 Aug 2024 09:24:16 -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 D90E3148C for ; Fri, 2 Aug 2024 09:24:03 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-499-jq9CL8W-M42GPEonxxVwbA-1; Fri, 02 Aug 2024 09:24:02 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3C9BD1954220 for ; Fri, 2 Aug 2024 13:24:01 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.16]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 332DA19560AA for ; Fri, 2 Aug 2024 13:23:59 +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_H3,RCVD_IN_MSPIKE_WL,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=1722605043; 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=DPUConoj7dcrNJqw75OujxTzDO39kEflo0s/HaBbRZU=; b=gClCEQBqq6ZzNpCcoA55j4PzZiFM2ytc7Svb5h/oNmqNvhzk5ktyj29I1MT2g8U5EqE58H 4EeMEtK7lckJbOqFPtOkhXeg82S0Etb7X4oWxQNtny1+uVktyOHIckhKu0rITWwqpPaH2M WBKzIzapCRgtY5jIfF1cMOFMrcOUtZ8= X-MC-Unique: jq9CL8W-M42GPEonxxVwbA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH v5 10/11] storage_source: Add field for skipping seclabel remembering Date: Fri, 2 Aug 2024 15:23:43 +0200 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-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5RA7LZABHDGIFIEQVWUDQ46VBPYX5SM5 X-Message-ID-Hash: 5RA7LZABHDGIFIEQVWUDQ46VBPYX5SM5 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: 1722605368862116600 Content-Type: text/plain; charset="utf-8" In case of incoming migration where a local directory is shared to other hosts we'll need to avoid seclabel remembering as the code would remember the seclabel already allowing access to the image. As the decision requires a lot of information not available in the security driver it would either require plumbing in unpleasant callbacks able to pass in the data or alternatively we can mark this in the 'virStorageSource' struct. This patch chose to do the latter approach by adding a field called 'seclabelSkipRemeber' which will be filled before starting the process in cases when it will be required. Signed-off-by: Peter Krempa --- src/conf/storage_source_conf.c | 3 +++ src/conf/storage_source_conf.h | 9 +++++++++ src/security/security_dac.c | 3 +++ src/security/security_selinux.c | 3 +++ 4 files changed, 18 insertions(+) diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index 908bc5fab2..3cbed8188f 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -820,6 +820,9 @@ virStorageSourceCopy(const virStorageSource *src, /* storage driver metadata are not copied */ def->drv =3D NULL; + /* flag to avoid seclabel rember is not copied */ + def->seclabelSkipRemeber =3D false; + def->path =3D g_strdup(src->path); def->fdgroup =3D g_strdup(src->fdgroup); def->volume =3D g_strdup(src->volume); diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index 05b4bda16c..96dedc63b5 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -431,6 +431,15 @@ struct _virStorageSource { bool thresholdEventWithIndex; virStorageSourceFDTuple *fdtuple; + + /* Setting 'seclabelSkipRemeber' to true will cause the security drive= r to + * not remembe the security label even if it otherwise were to be + * remembered. This is needed in cases such as incoming migration for + * shared images where the existing security label may no longer be the + * correct. The security driver otherwise doesn't have enough informat= ion + * to do this decision. + */ + bool seclabelSkipRemeber; }; G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageSource, virObjectUnref); diff --git a/src/security/security_dac.c b/src/security/security_dac.c index c327e4c9e0..2386d652df 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -940,6 +940,9 @@ virSecurityDACSetImageLabelInternal(virSecurityManager = *mgr, */ remember =3D isChainTop && !src->readonly && !src->shared; + if (src->seclabelSkipRemeber) + remember =3D false; + return virSecurityDACSetOwnership(mgr, src, NULL, user, group, remembe= r); } diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 158f40fed9..0f19e6ac63 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1992,6 +1992,9 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityMa= nager *mgr, ret =3D virSecuritySELinuxFSetFilecon(src->fdtuple->fds[0], use_la= bel); } else { + if (src->seclabelSkipRemeber) + remember =3D false; + ret =3D virSecuritySELinuxSetFilecon(mgr, path, use_label, remembe= r); } --=20 2.45.2