From nobody Sun Feb 8 23:42:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587720266; cv=none; d=zohomail.com; s=zohoarc; b=U5OQJQM0RYCrgo99SA3WSlPDVoLAQUCIvU3PE9JCFljrFZHX/5kWwsX+Y7ItR5e1jfLA4NHiXXwqMl5OmEmDwtkLDrZ5Ok4kxQRDLfnxCVmCmZWb94GOrQ09rX++DdvXn71OACvP8MUa3Lm6PliLDEgA2s/1jJATZjbHtklky9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587720266; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XBapTGgyLlCDfV8MW1KGdTn3BxFLKRZ0udmI1TzNiQU=; b=kl7K8VItSP2bbWZaaKf8KaXtjT8qhsDoeDs41BN9SCfItpaxKTHHcQ6ulBdeT4nrQlZkArNZTRnNM0x0QBV9b71Lrzf1eHE+GBeFzVSPK0fKWfwnlTLqoIAfnqLMyYr+StoX05HKikbNwBAnvn30LlCT1WAQiug4z51OcWwpon0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1587720266365580.2595964892039; Fri, 24 Apr 2020 02:24:26 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-83-bPb93x0yOF-oLzJ1WuhPwA-1; Fri, 24 Apr 2020 05:24:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D7571801504; Fri, 24 Apr 2020 09:24:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 811495D9CC; Fri, 24 Apr 2020 09:24:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0E58E1809543; Fri, 24 Apr 2020 09:24:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03O9ODST018289 for ; Fri, 24 Apr 2020 05:24:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 705E79080; Fri, 24 Apr 2020 09:24:13 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id D831460300 for ; Fri, 24 Apr 2020 09:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587720265; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XBapTGgyLlCDfV8MW1KGdTn3BxFLKRZ0udmI1TzNiQU=; b=NjxlSiwbNgeAzIl3hHF889KzOJ1AcyXfhwHJBe3qIUC40kmwImIDVer9OfPyvFJLFT9YLK AGbGYdFoXc1/Zr67oDC8gCkDhDi3CdQrE+9IcriZclqM+mAwLYasPelEHV1Gkt0ff/ciff mvLASuOgnLxrOSKvn931haSXUceEv6U= X-MC-Unique: bPb93x0yOF-oLzJ1WuhPwA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/4] security: Remove labelling of 'externalDataStore' Date: Fri, 24 Apr 2020 11:24:04 +0200 Message-Id: <5d96000cd05601ba31c8b994772c789df05948d2.1587720115.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The feature was never completed and is not really being pursued. Remove the storage driver integration. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/security/security_dac.c | 15 --------------- src/security/security_selinux.c | 17 +---------------- src/security/virt-aa-helper.c | 4 ---- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 11fff63bc7..bdc2d7edf3 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -983,14 +983,6 @@ virSecurityDACSetImageLabelRelative(virSecurityManager= Ptr mgr, if (virSecurityDACSetImageLabelInternal(mgr, def, n, parent, isCha= inTop) < 0) return -1; - if (n->externalDataStore && - virSecurityDACSetImageLabelRelative(mgr, - def, - n->externalDataStore, - parent, - flags) < 0) - return -1; - if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN)) break; @@ -1090,13 +1082,6 @@ virSecurityDACRestoreImageLabelInt(virSecurityManage= rPtr mgr, if (virSecurityDACRestoreImageLabelSingle(mgr, def, src, migrated) < 0) return -1; - if (src->externalDataStore && - virSecurityDACRestoreImageLabelSingle(mgr, - def, - src->externalDataStore, - migrated) < 0) - return -1; - return 0; } diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 281c303296..9a929debe1 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1806,13 +1806,6 @@ virSecuritySELinuxRestoreImageLabelInt(virSecurityMa= nagerPtr mgr, if (virSecuritySELinuxRestoreImageLabelSingle(mgr, def, src, migrated)= < 0) return -1; - if (src->externalDataStore && - virSecuritySELinuxRestoreImageLabelSingle(mgr, - def, - src->externalDataStore, - migrated) < 0) - return -1; - return 0; } @@ -1880,7 +1873,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityMa= nagerPtr mgr, return 0; use_label =3D parent_seclabel->label; - } else if (parent =3D=3D src || parent->externalDataStore =3D=3D src) { + } else if (parent =3D=3D src) { if (src->shared) { use_label =3D data->file_context; } else if (src->readonly) { @@ -1942,14 +1935,6 @@ virSecuritySELinuxSetImageLabelRelative(virSecurityM= anagerPtr mgr, if (virSecuritySELinuxSetImageLabelInternal(mgr, def, n, parent, i= sChainTop) < 0) return -1; - if (n->externalDataStore && - virSecuritySELinuxSetImageLabelRelative(mgr, - def, - n->externalDataStore, - parent, - flags) < 0) - return -1; - if (!(flags & VIR_SECURITY_DOMAIN_IMAGE_LABEL_BACKING_CHAIN)) break; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 8526b7b985..6e6dd1b1db 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -898,10 +898,6 @@ storage_source_add_files(virStorageSourcePtr src, if (add_file_path(tmp, depth, buf) < 0) return -1; - if (tmp->externalDataStore && - storage_source_add_files(tmp->externalDataStore, buf, depth) <= 0) - return -1; - depth++; } --=20 2.26.0