From patchwork Mon Oct 7 21:49:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 175438 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4849611ill; Mon, 7 Oct 2019 14:54:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqxrA//sHvyNYaFFf+KX9U46tRudHgAOi3dyPLGxxdWnOKMN61gSOf7xTwXGZorZOFb0zMNo X-Received: by 2002:a5e:9911:: with SMTP id t17mr13655955ioj.283.1570485245025; Mon, 07 Oct 2019 14:54:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570485245; cv=none; d=google.com; s=arc-20160816; b=nqD81yToI5yNw2gxmMpwSYEB/B/0tMSKn26AK1MVYyEmTATL+uKunhGm+8aPIRajLw e5Qdco/vaaL86a91UoYbhzEqCZGg+AusMv8ob4GwNiukackBzafrXOSSf4irEB2d7lRr ivIBL7xFM5EnyJjOehn27/eqQmDniLNGZo7hIhfXSO4PqxcP1Zs0nAzaSWUdja+3QEoz 8MrEaN85OpFfoIQyYnH0COeq1JXvzdnYNnFkuz1K/fm+kEH2Q6fG0x2rX2NxNH67/LVK QYmlINmIzBsssTbfX6a9UqrjDBKgO6vkpB0Fm4+GyXe5P7bLU8euRYvU/OSBXtXXnMq9 GQZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=XWa8XCwRus3mwFZX4aCMB+TG0mALjkaMthCPqznMddo=; b=QvsemhtJ/zpWjowRnr/hGwPNgnaZAVLTbNyjfkUTagCIJdxy5diceVVlpm680p+xRz LQn5FPnDkgtLRXFqHCkgHW+0JTsc8I3MxpcWUr4UlvX673Uk11FhyCnP+FiXyFaeAu2Z HkN6lnaQ6GY4iDVCCIGBqhhNAJ67ZCDB6AsFyqykQcpVShnOJEwISnCcg4GUjJMMIlWV hlKlsUdOwBmLjr+f9/WNriYMw9KFqnH7jndb41vkqGyo560/BWyH4B41kV4EHgS5pNZ1 jioq6hsF/zV5RQovvfVPYPyhEE+8hMaXwBQY2IhkWa/9QQm8Un0H62LzZcPsn7tX1WG1 taKg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id e2si16828123ilc.4.2019.10.07.14.54.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Oct 2019 14:54:05 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFB136696C; Mon, 7 Oct 2019 21:54:03 +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 83B6D1001DD8; Mon, 7 Oct 2019 21:54:03 +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 3B1FB1803B4D; Mon, 7 Oct 2019 21:54:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x97Low5m015197 for ; Mon, 7 Oct 2019 17:50:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 621265C231; Mon, 7 Oct 2019 21:50:58 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-123-156.rdu2.redhat.com [10.10.123.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id 019C25C1D4; Mon, 7 Oct 2019 21:50:57 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:44 -0400 Message-Id: <94b8d03253117e2155925f69743cafca7e00d321.1570482718.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 30/30] security: selinux: Label externalDataStore 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 07 Oct 2019 21:54:04 +0000 (UTC) We mirror the labeling strategy that was used for its top image Signed-off-by: Cole Robinson --- src/security/security_selinux.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Daniel Henrique Barboza diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index feb703d325..2a3b7fc10d 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1844,7 +1844,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr, virSecurityDeviceLabelDefPtr parent_seclabel = NULL; char *use_label = NULL; bool remember; - bool is_toplevel = parent == src; + bool is_toplevel = parent == src || parent->externalDataStore == src; int ret; if (!src->path || !virStorageSourceIsLocalStorage(src)) @@ -1931,6 +1931,14 @@ virSecuritySELinuxSetImageLabelRelative(virSecurityManagerPtr mgr, if (virSecuritySELinuxSetImageLabelInternal(mgr, def, n, parent) < 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; }