From nobody Sun Feb 8 12:14:18 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=1570551908; cv=none; d=zoho.com; s=zohoarc; b=llQRuCSuhqc8x+4/BE5GmWYTOm09IMFzPU9150ftdvC06i+P0XsMx7IHuDIQ384CNuh5IcQNU+GF5pYpd6zk/BKTWXlBjcFci4yyMJvb/HEYHl/c4aH0JGeqvZUEIsF46S1V8evf9WdTBqydJJn3fw+dyMPqS6LVG8sh7G9QtkQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570551908; h=Content-Type:Content-Transfer-Encoding:Cc: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; bh=yoPeqN5EdxaZYy7BDk8FhM6ZHpQgRcEE8XUvFqLFzlI=; b=dazfHjI3zJ0uy2XmTOhznETI4RISmXmsrR+4VU8v1hl5ihjCbg3s+auCTgEU9C8LUqGv6Qx12H0xbAl61D1GsxfWq+LslnR/paAxG4FCzcaVZ3NJBP0ZpPJQ3+ARNlHsILePlD54FnyE4d0jG3wqYusxwp/DVQP49WuSBq4gRpw= 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 1570551908863366.28339581344676; Tue, 8 Oct 2019 09:25:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D05459B286; Tue, 8 Oct 2019 16:25:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 863EF6060D; Tue, 8 Oct 2019 16:25: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 DA4054EE68; Tue, 8 Oct 2019 16:25:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x98GM1MY008683 for ; Tue, 8 Oct 2019 12:22:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id F34B760606; Tue, 8 Oct 2019 16:22:00 +0000 (UTC) Received: from worklaptop.bos.redhat.com (dhcp-17-175.bos.redhat.com [10.18.17.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8AF2460A9F; Tue, 8 Oct 2019 16:22:00 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Tue, 8 Oct 2019 12:22:24 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: christian.ehrhardt@canonical.com Subject: [libvirt] [PATCH 4/7] security: apparmor: Pass virStorageSource to add_file_path 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 08 Oct 2019 16:25:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The virStorageSource must have everything it needs Signed-off-by: Cole Robinson --- src/security/virt-aa-helper.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 7148e3c760..9f39eb2e2b 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -911,20 +911,19 @@ file_iterate_pci_cb(virPCIDevicePtr dev ATTRIBUTE_UNU= SED, } =20 static int -add_file_path(virDomainDiskDefPtr disk, - const char *path, +add_file_path(virStorageSourcePtr src, size_t depth, virBufferPtr buf) { int ret; =20 if (depth =3D=3D 0) { - if (disk->src->readonly) - ret =3D vah_add_file(buf, path, "rk"); + if (src->readonly) + ret =3D vah_add_file(buf, src->path, "rk"); else - ret =3D vah_add_file(buf, path, "rwk"); + ret =3D vah_add_file(buf, src->path, "rwk"); } else { - ret =3D vah_add_file(buf, path, "rk"); + ret =3D vah_add_file(buf, src->path, "rk"); } =20 if (ret !=3D 0) @@ -945,7 +944,7 @@ disk_add_files(virDomainDiskDefPtr disk, /* execute the callback only for local storage */ if (virStorageSourceIsLocalStorage(tmp) && tmp->path) { - if (add_file_path(disk, tmp->path, depth, buf) < 0) + if (add_file_path(tmp, depth, buf) < 0) return -1; } =20 --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list