From patchwork Mon Oct 7 21:49:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 175441 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4853769ill; Mon, 7 Oct 2019 14:58:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqzjEdRlMcvuyB1V1+8teVOXJ+2GIZf22WpipiYH1pUuYrqX0TfU4uwpyMggXCN+Py9NaP6K X-Received: by 2002:a6b:6d07:: with SMTP id a7mr21669666iod.261.1570485527220; Mon, 07 Oct 2019 14:58:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570485527; cv=none; d=google.com; s=arc-20160816; b=RAEeAEZYYBhH/vHDR7lWxmgr476VFLGxd1tOct8IKocioqn4DIO0M5WYsuDKYl4G9J q/gUDyocicfPPlrK5H+F8QMIik0535RSNVsPuWokVvKVywPtKTyX8dj7aYBEmn9iMTaz Hdn9wux2iJlXsX/H+IzUyWhdxdNOfUflep7Eo8mI1d2VHBRAA/vGfyPUfXi+HKXBUPe/ yzhEQrlQnGTYoFYzY9d1H/e7f89zouRIaQ1kh9svAqoXbQOm2jXKtaq1cgqknUtUI4OH 4g05uYVbQwMCtvuZVfgRupZEuxGbyb2NI0dgQQeje7YK/vVqta9ZBqBOVAdzyK/7D59D Qx4w== 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=i46mNjIrBFYKACNkG2hSW0WezITiHDY/noOqStY/qQg=; b=GY35qzF3YcOZoLz/EQBBPNEX36EzBjKlIsrnz7yF7FbVrD65k9OSzoKFYmWQmeoXB/ yEJpAmsmE4u2V7kII+zn9SgthgIBLkn4JBdTVeZSuNivOnSibyjPMmaXU8vqYsmsXnKN sODsXO94QXkvYIncouU661mz2a+01jiWBJEYr30M2sGZmrxhhpCMMCXPxRhD99E3k4RR cby+vxr4gubvskVrSfXs0AQCVm0SmIDhHoHar9lEUE3nerSNI2dVgw8+3AT8zs5shtBS sL6QGolkN6gJ4i2eNB9Rsw+Ata0tRv5oDk55UFsu7A2iwuEHsGzxFOjx3srjvaUMZlRq w20w== 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 h83si17558480ioa.60.2019.10.07.14.58.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Oct 2019 14:58:47 -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-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 mx1.redhat.com (Postfix) with ESMTPS id 184C03B58C; Mon, 7 Oct 2019 21:58:46 +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 C75535DC1E; Mon, 7 Oct 2019 21:58:45 +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 874D41803518; Mon, 7 Oct 2019 21:58:45 +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 x97Lou8B015181 for ; Mon, 7 Oct 2019 17:50:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id A56325C231; Mon, 7 Oct 2019 21:50:56 +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 489F15C1D4; Mon, 7 Oct 2019 21:50:56 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:41 -0400 Message-Id: <726ba82b9504505face29a83451f27a046635bcd.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 27/30] security: selinux: Add is_toplevel to SetImageLabelInternal 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 07 Oct 2019 21:58:46 +0000 (UTC) This will simplify future patches and make the logic easier to follow Signed-off-by: Cole Robinson --- src/security/security_selinux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 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 e384542c49..fd7dd080c1 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1824,6 +1824,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr, virSecurityDeviceLabelDefPtr parent_seclabel = NULL; char *use_label = NULL; bool remember; + bool is_toplevel = parent == src; int ret; if (!src->path || !virStorageSourceIsLocalStorage(src)) @@ -1845,7 +1846,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr, * but the top layer, or read only image, or disk explicitly * marked as shared. */ - remember = src == parent && !src->readonly && !src->shared; + remember = is_toplevel && !src->readonly && !src->shared; disk_seclabel = virStorageSourceGetSecurityLabelDef(src, SECURITY_SELINUX_NAME); @@ -1862,7 +1863,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityManagerPtr mgr, return 0; use_label = parent_seclabel->label; - } else if (parent == src) { + } else if (is_toplevel) { if (src->shared) { use_label = data->file_context; } else if (src->readonly) {