From nobody Sun Feb 8 09:12:14 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=1570485241; cv=none; d=zoho.com; s=zohoarc; b=EN4E3vjDptFhMDUf2z4oMj7y8biv2MMxORj2ly4VBtPkk1RQnl4qKNf23U95acfuv4eVKWoH9JDmwBbJWxlH7u1+j1vcLsvYCiKwmfUnB+IW3dIsSblajTN5kRE3g9l/85rUoxoyISBpFqOO2DVuG3nFd0VCMWgMC1GsyRcH69I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570485241; 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=yrAsWrbf1XxuKHcdnldGVb/y5JxxZiUoTFBeKbAzqcA=; b=jwDCYZ3si8esAMUt7yEZDywq+LVKMK0uUbE+MzWlwkhrXmkYFfUXIsQqAO5AZYCqtpA5cFZN+/IrSkntZm1AoagKwppb/DThwBgm/c0uKczT0L4uyr4ABxEjNdU83yu5oGJD2J3bGJOJDjzg+vhVEYP0f4X3HdoiLf/c6S/HsOQ= 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 1570485241733766.2380014042963; Mon, 7 Oct 2019 14:54:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31D24811DE; Mon, 7 Oct 2019 21:54:00 +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 07A265B681; Mon, 7 Oct 2019 21:54:00 +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 C2EEB1803518; Mon, 7 Oct 2019 21:53:59 +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 x97LouIR015169 for ; Mon, 7 Oct 2019 17:50:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1CE3A5C231; 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 B2A2D5C1D4; Mon, 7 Oct 2019 21:50:55 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:40 -0400 Message-Id: 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 26/30] security: selinux: Drop !parent handling in 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 07 Oct 2019 21:54:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The only caller always passes in a non-null parent Signed-off-by: Cole Robinson Reviewed-by: Daniel Henrique Barboza --- src/security/security_selinux.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 9d28bc5773..e384542c49 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1849,9 +1849,8 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityMa= nagerPtr mgr, =20 disk_seclabel =3D virStorageSourceGetSecurityLabelDef(src, SECURITY_SELINUX_N= AME); - if (parent) - parent_seclabel =3D virStorageSourceGetSecurityLabelDef(parent, - SECURITY_SEL= INUX_NAME); + parent_seclabel =3D virStorageSourceGetSecurityLabelDef(parent, + SECURITY_SELINUX= _NAME); =20 if (disk_seclabel && (!disk_seclabel->relabel || disk_seclabel->label)= ) { if (!disk_seclabel->relabel) @@ -1863,7 +1862,7 @@ virSecuritySELinuxSetImageLabelInternal(virSecurityMa= nagerPtr mgr, return 0; =20 use_label =3D parent_seclabel->label; - } else if (!parent || parent =3D=3D src) { + } else if (parent =3D=3D src) { 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