Merge pull request lxc#4567 from mihalicyn/various_fixes_jul2025

A bunch of fixes (Jul 2025)

Author: stgraber

src/lxc/conf.c

@@ -2682,11 +2682,11 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f)
 		ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts);
 		if (ret < 0)
 			return syserror("Failed to parse LXC specific mount options");
-		__data = opts.data;
 
 		ret = parse_mount_attrs(&opts, mntent.mnt_opts);
 		if (ret < 0)
 			return syserror("Failed to parse mount options");
+		__data = opts.data;
 
 		/* No idmapped mount entry so skip it. */
 		if (is_empty_string(opts.userns_path))

src/lxc/network.c

@@ -4183,6 +4183,7 @@ int lxc_network_recv_name_and_ifindex_from_child(struct lxc_handler *handler)
 		ret = lxc_recv_nointr(data_sock, netdev->name, IFNAMSIZ, 0);
 		if (ret < 0)
 			return -1;
+		netdev->name[IFNAMSIZ-1] = '\0';
 
 		/* Receive network device ifindex in the child's namespace to
 		 * parent.

src/tests/lxc-test-rootfs

@@ -9,6 +9,7 @@ set -ex
 cleanup() {
 	set +e
 	lxc-destroy -n lxc-test-rootfs -f
+	sed -i '/^root:910000:10000/d' /etc/subuid /etc/subgid
 	if [ $PHASE != "done" ]; then
 		echo "rootfs test failed at $PHASE"
 		exit 1
@@ -48,4 +49,20 @@ mkdir /proc/$pid/root/rwtest || ro=1
 rmdir /proc/$pid/root/rwtest
 ro=0
 
+lxc-stop -n lxc-test-rootfs -k
+PHASE=idmapped_rootfs
+echo "Starting phase $PHASE"
+usermod -v 910000-919999 -w 910000-919999 root
+sed -i '/lxc.rootfs.options/d' $config
+echo "lxc.idmap = u 0 910000 9999" >> $config
+echo "lxc.idmap = g 0 910000 9999" >> $config
+echo "lxc.rootfs.options = idmap=container" >> $config
+lxc-start -n lxc-test-rootfs
+pid=$(lxc-info -n lxc-test-rootfs -p -H)
+ro=0
+lxc-attach -n lxc-test-rootfs -- mkdir /rwtest || ro=1
+[ $ro -ne 1 ]
+rmdir /proc/$pid/root/rwtest
+ro=0
+
 PHASE=done

src/tests/lxc-test-snapdeps

@@ -14,6 +14,7 @@
 
 set -e
 
+modprobe -v overlay || true
 if ! grep -q overlay /proc/filesystems; then
 	echo "Not running this test as overlay is not available"
 	exit 0