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 31972BB95E for ; Mon, 25 Mar 2024 18:29:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1B44B91E0 for ; Mon, 25 Mar 2024 18:29:19 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Mon, 25 Mar 2024 18:29:18 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 423E342005 for ; Mon, 25 Mar 2024 18:29:18 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Mon, 25 Mar 2024 18:28:28 +0100 Message-Id: <20240325172829.26262-2-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240325172829.26262-1-f.schauer@proxmox.com> References: <20240325172829.26262-1-f.schauer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.090 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v2 container 1/2] fix #5160: fix move_mount regression for mount point hotplug 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: Mon, 25 Mar 2024 17:29:19 -0000 Set up an Apparmor profile to allow moving mounts for mount point hotplug. This fixes a regression caused by kernel commit 157a3537d6 ("apparmor: Fix regression in mount mediation") The commit introduced move_mount mediation, which now requires move_mount to be allowed in the Apparmor profile. Although it is allowed for most paths in the /usr/bin/lxc-start profile, move_mount is called with a file descriptor instead of a path in mountpoint_insert_staged, thus it is not affected by the allow rules in /etc/apparmor.d/abstractions/lxc/container-base. To fix this, introduce a new Apparmor profile to allow move_mount on every mount, specifically for mount point hotplug. Signed-off-by: Filip Schauer --- debian/rules | 3 +++ src/Makefile | 3 +++ src/PVE/LXC.pm | 2 +- src/pve-container-debug@.service | 1 + src/pve-container-mounthotplug | 7 +++++++ src/pve-container@.service | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/pve-container-mounthotplug diff --git a/debian/rules b/debian/rules index d999152..f7edccf 100755 --- a/debian/rules +++ b/debian/rules @@ -14,3 +14,6 @@ override_dh_installsystemd: dh_installsystemd -ppve-container --no-start --no-enable --no-restart-after-upgrade -r 'system-pve\x2dcontainer.slice' + +override_dh_install: + dh_apparmor -p pve-container --profile-name=pve-container-mounthotplug diff --git a/src/Makefile b/src/Makefile index 5a7a82e..e0b7734 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,6 +4,7 @@ PREFIX=${DESTDIR}/usr BINDIR=${PREFIX}/bin LIBDIR=${PREFIX}/lib SBINDIR=${PREFIX}/sbin +ETCDIR=${DESTDIR}/etc MANDIR=${PREFIX}/share/man DOCDIR=${PREFIX}/share/doc/${PACKAGE} LXC_SCRIPT_DIR=${PREFIX}/share/lxc @@ -13,6 +14,7 @@ LXC_CONFIG_DIR=${LXC_SCRIPT_DIR}/config LXC_COMMON_CONFIG_DIR=${LXC_CONFIG_DIR}/common.conf.d LXC_USERNS_CONFIG_DIR=${LXC_CONFIG_DIR}/userns.conf.d SERVICEDIR=${DESTDIR}/lib/systemd/system +APPARMORDDIR=${ETCDIR}/apparmor.d PODDIR=${DOCDIR}/pod MAN1DIR=${MANDIR}/man1/ MAN5DIR=${MANDIR}/man5/ @@ -73,6 +75,7 @@ install: pct lxc-pve.conf pct.1 pct.conf.5 pct.bash-completion pct.zsh-completio gzip -9 ${MAN5DIR}/pct.conf.5 cd ${MAN5DIR}; ln -s pct.conf.5.gz ct.conf.5.gz install -D -m 0644 10-pve-ct-inotify-limits.conf ${LIBDIR}/sysctl.d/10-pve-ct-inotify-limits.conf + install -D -m 0644 pve-container-mounthotplug ${APPARMORDDIR}/pve-container-mounthotplug pve-userns.seccomp: /usr/share/lxc/config/common.seccomp cp $< $@ diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 7883cfb..7db4833 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1974,7 +1974,7 @@ sub mountpoint_hotplug :prototype($$$$$) { my $dir = get_staging_mount_path($opt); # Now switch our apparmor profile before mounting: - my $data = 'changeprofile /usr/bin/lxc-start'; + my $data = 'changeprofile pve-container-mounthotplug'; if (syswrite($aa_fd, $data, length($data)) != length($data)) { die "failed to change apparmor profile: $!\n"; } diff --git a/src/pve-container-debug@.service b/src/pve-container-debug@.service index 7cfebaa..cd0895c 100644 --- a/src/pve-container-debug@.service +++ b/src/pve-container-debug@.service @@ -13,6 +13,7 @@ Type=simple Delegate=yes KillMode=mixed TimeoutStopSec=120s +ExecStartPre=/lib/apparmor/profile-load pve-container-mounthotplug ExecStart=/usr/bin/lxc-start -F -n %i -o /dev/stderr -l DEBUG ExecStop=/usr/share/lxc/pve-container-stop-wrapper %i # Environment=BOOTUP=serial diff --git a/src/pve-container-mounthotplug b/src/pve-container-mounthotplug new file mode 100644 index 0000000..e6f3903 --- /dev/null +++ b/src/pve-container-mounthotplug @@ -0,0 +1,7 @@ +#include + +profile pve-container-mounthotplug flags=(attach_disconnected) { + #include + + mount options=(move), +} diff --git a/src/pve-container@.service b/src/pve-container@.service index fdc373e..1437858 100644 --- a/src/pve-container@.service +++ b/src/pve-container@.service @@ -13,6 +13,7 @@ Type=simple Delegate=yes KillMode=mixed TimeoutStopSec=120s +ExecStartPre=/lib/apparmor/profile-load pve-container-mounthotplug ExecStart=/usr/bin/lxc-start -F -n %i ExecStop=/usr/share/lxc/pve-container-stop-wrapper %i # Environment=BOOTUP=serial -- 2.39.2