From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BA22E652AD for ; Wed, 22 Jul 2020 13:05:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B0EE51FBEE for ; Wed, 22 Jul 2020 13:05:17 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id A7B9A1FBDA for ; Wed, 22 Jul 2020 13:05:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 71D08430E1 for ; Wed, 22 Jul 2020 13:05:16 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Wed, 22 Jul 2020 13:05:05 +0200 Message-Id: <20200722110505.8210-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722110505.8210-1-s.ivanov@proxmox.com> References: <20200722110505.8210-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [start-container.in] Subject: [pve-devel] [PATCH lxc 2/2] apparmor: add rule for allowing remount of boot_id X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2020 11:05:47 -0000 commit 863845075d3f77d27c91bd9f47d2f8ddc4867bd5 in upstream only partially fixes the apparmor deny for mounting boot_id (used for example for identifying different boots with `journalctl`) inside the container. Tested by editing the profile and replacing it disregarding the cache: `apparmor_parser -W -T -r /etc/apparmor.d/usr.bin.lxc-start` Signed-off-by: Stoiko Ivanov --- ...apparmor-Allow-ro-remount-of-boot_id.patch | 26 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 27 insertions(+) create mode 100644 debian/patches/pve/0004-apparmor-Allow-ro-remount-of-boot_id.patch diff --git a/debian/patches/pve/0004-apparmor-Allow-ro-remount-of-boot_id.patch b/debian/patches/pve/0004-apparmor-Allow-ro-remount-of-boot_id.patch new file mode 100644 index 0000000..fefc586 --- /dev/null +++ b/debian/patches/pve/0004-apparmor-Allow-ro-remount-of-boot_id.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Stoiko Ivanov +Date: Wed, 22 Jul 2020 12:17:24 +0200 +Subject: [PATCH lxc] apparmor: Allow ro remount of boot_id + +The rule added in 863845075d3f77d27c91bd9f47d2f8ddc4867bd5 did not cover all +necessary mount calls for /proc/sys/kernel/random/boot_id +(in src/lxc/conf.c: lxc_setup_boot_id) - the ro remount is missing. + +Signed-off-by: Stoiko Ivanov +--- + config/apparmor/abstractions/start-container.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config/apparmor/abstractions/start-container.in b/config/apparmor/abstractions/start-container.in +index 9998f1121..9f64c2727 100644 +--- a/config/apparmor/abstractions/start-container.in ++++ b/config/apparmor/abstractions/start-container.in +@@ -22,6 +22,7 @@ + mount -> /var/lib/lxc/{**,}, + + mount /dev/.lxc-boot-id -> /proc/sys/kernel/random/boot_id, ++ mount options=(ro, nosuid, nodev, noexec, remount, bind) -> /proc/sys/kernel/random/boot_id, + + # required for some pre-mount hooks + mount fstype=overlayfs, diff --git a/debian/patches/series b/debian/patches/series index ee20ef5..f588081 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch pve/0003-PVE-Config-attach-always-use-getent.patch +pve/0004-apparmor-Allow-ro-remount-of-boot_id.patch -- 2.20.1