From nobody Sun Feb 8 18:09:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1570485527; cv=none; d=zoho.com; s=zohoarc; b=RLw9dnjBqRZ/neDN88K999+uSxyZDmEjr7K35P7Hrq/ChnBSaSu0a7oGH79jhYl+yNbJ1pwRj1h+DyNDurrxd4cmRPElfmvr5a1c2kftoYGi1SfG8eMELkW3xWeoKhybqx05pVfvmn+3/sf/5tRUvlD1kejmMejBgIFtXBcl/KE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570485527; 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:ARC-Authentication-Results; bh=i46mNjIrBFYKACNkG2hSW0WezITiHDY/noOqStY/qQg=; b=C1pcKjS9IWwzdbw4F+tAkkdCTRQ9Eob2VKEdSOeQh9sk8WFeVqLNaJNi9aLKHJqTj8ZPq8kNA1qDNmdmZ9o4As2QlhkZ589zv3+tbicsxO6FDEf8U2R4CbtzuT3NREd36Uqgag8hXjo3pPamOI8L9Msa5VI5XHrdGp/uVIlsqlc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1570485527789478.72781161012585; Mon, 7 Oct 2019 14:58:47 -0700 (PDT) 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) 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: , Content-Transfer-Encoding: quoted-printable 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) Content-Type: text/plain; charset="utf-8" This will simplify future patches and make the logic easier to follow Signed-off-by: Cole Robinson Reviewed-by: Daniel Henrique Barboza --- src/security/security_selinux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index e384542c49..fd7dd080c1 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1824,6 +1824,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityMa= nagerPtr mgr, virSecurityDeviceLabelDefPtr parent_seclabel =3D NULL; char *use_label =3D NULL; bool remember; + bool is_toplevel =3D parent =3D=3D src; int ret; =20 if (!src->path || !virStorageSourceIsLocalStorage(src)) @@ -1845,7 +1846,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityMa= nagerPtr mgr, * but the top layer, or read only image, or disk explicitly * marked as shared. */ - remember =3D src =3D=3D parent && !src->readonly && !src->shared; + remember =3D is_toplevel && !src->readonly && !src->shared; =20 disk_seclabel =3D virStorageSourceGetSecurityLabelDef(src, SECURITY_SELINUX_N= AME); @@ -1862,7 +1863,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityMa= nagerPtr mgr, return 0; =20 use_label =3D parent_seclabel->label; - } else if (parent =3D=3D src) { + } else if (is_toplevel) { if (src->shared) { use_label =3D data->file_context; } else if (src->readonly) { --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list