From patchwork Mon Oct 7 21:49:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 175435 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4849440ill; Mon, 7 Oct 2019 14:53:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzV5lOvtCrw9jzHry2AN5dVcV8FfXlnzOr+QW6Z94FksuFUyt6aw/8+Qs4w5rwuVydvXcxR X-Received: by 2002:a9d:4803:: with SMTP id c3mr23601266otf.155.1570485234172; Mon, 07 Oct 2019 14:53:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570485234; cv=none; d=google.com; s=arc-20160816; b=Id8YyKCyczEbiNfLd1Vc62/KYHSn1/kAkOZQVpv5VCmh5gqka/8Q/fWydU2TB27tij Rg+sm5zeUDuwK1zkrsbWVjy3ryw/X4wkIlsZ7Eyi/lzY4F+zThZwVy/cMwOMAWYnBnjQ +vvgDpnfFZSbuCiHzMIUMftLge6AICShWsXpsCjNLAzG0fTRuXAnIEpIacYJ8B1oieh6 vPR8Ladsdksh5dcHUmd+i+XTBQSGQ+urWHC1+ddNPN9dXQTHLufwFKwmLbctloB6ZqZW ercFqRaRxFAGEZMBcC6jHNMCilnL/XPJVotUhEsLc3N1RjoCrLZvXkibgNS2k06HFAv4 y1sA== 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=AJD2k1C574v5oHdqviVGnvYiOetDZgIBOROcdC390Do=; b=TvSm042GpIv5GUfDAQpnBTVZhXm01YGOwlPQ2ELuZDjYkHh+1jCKRxrY27Pfq4kR2y vSBor0RP8JqGlq0odxKbAdY3ev2jqkHKcSJQUaFA4vHQG6DqRVpz0NO8omCKsq2XINf1 3G14OKc/+3D27hbD72UIvigM5N8mx/wrzXYLw5gYMI8vLe4Eu2wJzmz6Kk/RMFr6FrOf HTIx4xiOxgBXU7XRSGr3VxRDTHE5ud4TB0hni/4fND9/97m+K7B613PevRWyTSWdc9b8 KI6J5C2qsODKSCenAXjy7/Dr0kFGi7CvlEo190ZI8Y8RrM+AYyeq9pNaL4eYYfQgag/4 Kbdg== 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 v137si9626884oia.104.2019.10.07.14.53.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Oct 2019 14:53:54 -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-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 14739C054C52; Mon, 7 Oct 2019 21:53:53 +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 E3BD55C22F; Mon, 7 Oct 2019 21:53:52 +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 A8461180BA99; Mon, 7 Oct 2019 21:53:52 +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 x97Loi9R015106 for ; Mon, 7 Oct 2019 17:50:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 176075C231; Mon, 7 Oct 2019 21:50:44 +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 D500F5C290; Mon, 7 Oct 2019 21:50:38 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:35 -0400 Message-Id: <253129220c00b19e0ae28d9d0e84aea7c7645834.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 21/30] security: dac: 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 07 Oct 2019 21:53:53 +0000 (UTC) This will simplify future patches and make the logic easier to follow Signed-off-by: Cole Robinson --- src/security/security_dac.c | 3 ++- 1 file changed, 2 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_dac.c b/src/security/security_dac.c index bcc781213e..6d0c8a9b1c 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -882,6 +882,7 @@ virSecurityDACSetImageLabelInternal(virSecurityManagerPtr mgr, virSecurityDeviceLabelDefPtr parent_seclabel = NULL; virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); bool remember; + bool is_toplevel = parent == src; uid_t user; gid_t group; @@ -926,7 +927,7 @@ virSecurityDACSetImageLabelInternal(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; return virSecurityDACSetOwnership(mgr, src, NULL, user, group, remember); }