From patchwork Mon Oct 7 21:49:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 175431 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4848701ill; Mon, 7 Oct 2019 14:53:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqwioJekFOWnA42Eddksq8FxwHGXUXvZG0BTD6KUgp8KgYkeLufTGsqx+JGz71dlxLcCW8Uw X-Received: by 2002:a92:cd45:: with SMTP id v5mr33282213ilq.197.1570485187599; Mon, 07 Oct 2019 14:53:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570485187; cv=none; d=google.com; s=arc-20160816; b=yANvVF14BbRXRaZd8lAm97HgmcQs/sKiE3iRMSnMoXSWmAwOtgwDEOhWPCsBV6HcJv JjSgo54p8SveKTM/cCPF1BWKwOIZbNuWsPbF9XOdf02SS7T90V0j9oKYUzWOAT8BTjf8 przPS/4bdhMPtkop6GKu5lxM5bnYRuxtX3cR0YFBZeEVEKcNzxr6EeZ2lckAyDIm4wcH 0wxSchs2qofxYqEZvHAs6g55MTmKTkieU2NifJvKfDfjEaUpK3yPozzG1LpYtTwlIukV TiBDGwmIkVRYOMXs4/QXp7DFsPEfP9eOiDGDfJOmv0H6jWaoa5kBKwrqZlU1Kxhet3YL L9Dg== 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=6IntyRMLy/22DPoU/4VY0uaXSnyOXx1DJdGmlRgbAh4=; b=go3hjO6f5djARxlyccBxH3WIyuk8zuLgGZouCcPZ/mYmOaA5GYdQpWmvBQ71ngmYTc vhj66Od+KmBZ5RkqYD/zT7qBfr8Tp1l7KcOwYkrMIHVhtlhocgb8EtVIIwtbV7IAEQ1m u18RGbJGhY22nXt8Gw/dItS/zRx/ETahthnrIh+szVRet4mxmmay4pn6kguUOrSTT7CH MtdCVDPJ+IFMd3bA2SAfMiThq3yEAd0PXBFyFwUyFdezoobd/eEWwOYA8K65Xd9ZrFB4 NXyfFTgN8TJ/HAv8S2vrxN34StQcKSXcIrOcbbjG6MI8ueHJYPpg/1uPQFUURnqoZ1Jn RYtA== 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 c22si18783182ioa.24.2019.10.07.14.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Oct 2019 14:53:07 -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 7E56589C6AE; Mon, 7 Oct 2019 21:53:06 +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 522CD10027C3; Mon, 7 Oct 2019 21:53:06 +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 14D8E180B536; Mon, 7 Oct 2019 21:53:06 +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 x97LopAo015138 for ; Mon, 7 Oct 2019 17:50:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id D03755C231; Mon, 7 Oct 2019 21:50:51 +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 C345B5C219; Mon, 7 Oct 2019 21:50:44 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:36 -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 22/30] security: dac: Restore image label for 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.6.2 (mx1.redhat.com [10.5.110.69]); Mon, 07 Oct 2019 21:53:07 +0000 (UTC) Rename the existing virSecurityDACRestoreImageLabelInt to virSecurityDACRestoreImageLabelSingle, and extend the new ImageLabelInt handle externalDataStore Signed-off-by: Cole Robinson --- src/security/security_dac.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 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_dac.c b/src/security/security_dac.c index 6d0c8a9b1c..befa388791 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -954,10 +954,10 @@ virSecurityDACSetImageLabel(virSecurityManagerPtr mgr, static int -virSecurityDACRestoreImageLabelInt(virSecurityManagerPtr mgr, - virDomainDefPtr def, - virStorageSourcePtr src, - bool migrated) +virSecurityDACRestoreImageLabelSingle(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virStorageSourcePtr src, + bool migrated) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityLabelDefPtr secdef; @@ -1008,6 +1008,26 @@ virSecurityDACRestoreImageLabelInt(virSecurityManagerPtr mgr, } +static int +virSecurityDACRestoreImageLabelInt(virSecurityManagerPtr mgr, + virDomainDefPtr def, + virStorageSourcePtr src, + bool migrated) +{ + if (virSecurityDACRestoreImageLabelSingle(mgr, def, src, migrated) < 0) + return -1; + + if (src->externalDataStore && + virSecurityDACRestoreImageLabelSingle(mgr, + def, + src->externalDataStore, + migrated) < 0) + return -1; + + return 0; +} + + static int virSecurityDACRestoreImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def,