From nobody Thu Sep 19 00:15:47 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 1721835546054252.35812488917793; Wed, 24 Jul 2024 08:39:06 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0DB9911D0; Wed, 24 Jul 2024 11:39:05 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D4746DB6; Wed, 24 Jul 2024 11:35:09 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CFEAAD63; Wed, 24 Jul 2024 11:35:00 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 74C3011C8 for ; Wed, 24 Jul 2024 11:34:47 -0400 (EDT) Received: from mx-prod-mc-02.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-688-dxY-j7IZNmWEDabUVtvaaA-1; Wed, 24 Jul 2024 11:34:45 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C65451955BF8 for ; Wed, 24 Jul 2024 15:34:44 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.23]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F1AE81955D4F for ; Wed, 24 Jul 2024 15:34:43 +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_H4,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=1721835287; 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=z/fD2cHJaN6gPUtlygKRtENuYlzPBdakHFQLngwp2tk=; b=eqcU8z9myizkIUOu9Mu8zKFFhLuAnwOsBuQzpoT1+OQihmFFXpeL5ONOlWq9dxG7Lv0avd 5IdVhJN2zfW04WIkcd69XzZkxlf+QcgLiFQLzEWDAZudTq7h6K/Th8FDaMDAiLoaAg++Y0 gf3NDA/L5qs91xHkC8E/bHReaIuiE6A= X-MC-Unique: dxY-j7IZNmWEDabUVtvaaA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 7/8] storage_source: Add field for skipping seclabel remembering Date: Wed, 24 Jul 2024 17:34:31 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 77U6IGTAHL5QQNOENZ52FI56CWHNDPZN X-Message-ID-Hash: 77U6IGTAHL5QQNOENZ52FI56CWHNDPZN 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: 1721835547188116600 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 f2f784b4fa..f5eac5d3e1 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 994f6cd3d0..a981173230 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1985,6 +1985,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