From nobody Mon Feb 9 21:36:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1688044522; cv=none; d=zohomail.com; s=zohoarc; b=Oy2DCL5H6++efvyrEhdHgJEgh0vG9QYa9Zbg8DAV533gqPafuO+fUONh/bU5HjMJAsQ9QPAYAO9J/pFmL+KM3i6+hU+qUySPhxMbW5ZXgCtRzzs0sGoPE11jVEoelF/iGnk9HQNnYRLvUlRYsE2I3GstEkkrfBfdDmk9Z4WP5kI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688044522; 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; bh=rONqoTKlzlhDvfszB9kk7ARN7y7m3Bf2L0eKxLYgIm0=; b=gTWWEFPX++IVoLI0E4Oj/GRZyBhPmdLNOVWlxMv/B+mHONMrHXquEOtdo4e68L3QvGEOsXmPB+PtvG0SnzWWouzpOmHDS4YZ7M2exGPURIpjMErM6j7TOOPGJM/cBqFZkrq0Z4G9efnFFaD2EFsksTJpwATrMWpUJp8MghMXciE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1688044522468555.2706310629258; Thu, 29 Jun 2023 06:15:22 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-260-lKNENq92N-qGlLIgvWNJjw-1; Thu, 29 Jun 2023 09:15:17 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 51665894EDC; Thu, 29 Jun 2023 13:15:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C0B2492B02; Thu, 29 Jun 2023 13:15:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 31F551946A41; Thu, 29 Jun 2023 13:15:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 48DFC19465B6 for ; Thu, 29 Jun 2023 13:15:04 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 37F3240C6CCD; Thu, 29 Jun 2023 13:15:04 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD3644087C6A for ; Thu, 29 Jun 2023 13:15:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688044521; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=rONqoTKlzlhDvfszB9kk7ARN7y7m3Bf2L0eKxLYgIm0=; b=e8+zZS4XSfKXeH242FEsVNlBnfeMRBpaC6qkBkozkOOT1RTz4pclByMsLxXbX5R7ji6BTT /i9P+Pz/DlEeQzwyWN9Ha8zqfqvIDcgEfOXTNPT/EDT2IoD8reRHIv+XEI18SfN70D29Qq tBsYlUwcX3Wtbp0KNlABHPjyDHTdgmk= X-MC-Unique: lKNENq92N-qGlLIgvWNJjw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 6/8] apparmor: Improve virt-aa-helper include Date: Thu, 29 Jun 2023 15:14:55 +0200 Message-ID: <20230629131457.248503-7-abologna@redhat.com> In-Reply-To: <20230629131457.248503-1-abologna@redhat.com> References: <20230629131457.248503-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1688044524406100001 Content-Type: text/plain; charset="utf-8"; x-default="true" For AppArmor 3.x we can use 'include if exists', which frees us from having to create a dummy override. For AppArmor 2.x we keep things as they are to avoid introducing regressions. Signed-off-by: Andrea Bolognani --- src/security/apparmor/meson.build | 15 ++++++++++----- .../apparmor/usr.lib.libvirt.virt-aa-helper.in | 5 +++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meso= n.build index 8bc2405f88..b9257c816d 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build @@ -77,8 +77,13 @@ install_data( install_dir: apparmor_dir / 'libvirt', ) =20 -install_data( - 'usr.lib.libvirt.virt-aa-helper.local', - install_dir: apparmor_dir / 'local', - rename: 'usr.lib.libvirt.virt-aa-helper', -) +if not conf.has('WITH_APPARMOR_3') + # We only install the empty local override for AppArmor 2.x. For + # AppArmor 3.x, upstream's preference is to avoid creating these + # files in order to limit the amount of filesystem clutter. + install_data( + 'usr.lib.libvirt.virt-aa-helper.local', + install_dir: apparmor_dir / 'local', + rename: 'usr.lib.libvirt.virt-aa-helper', + ) +endif diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/= security/apparmor/usr.lib.libvirt.virt-aa-helper.in index ff1d46bebe..26ee20a17d 100644 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -71,5 +71,10 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { /**.[iI][sS][oO] r, /**/disk{,.*} r, =20 +@BEGIN_APPARMOR_3@ + include if exists +@END_APPARMOR_3@ +@BEGIN_APPARMOR_2@ #include +@END_APPARMOR_2@ } --=20 2.41.0