From: Christian Marangi Date: Wed, 22 Oct 2025 00:17:25 +0000 (+0200) Subject: image: fix race between mkits.sh and mkimage in .itb squashfs generation X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=3de1bbd5aeb542de9a4b20eff0f6bbf1767fd6b9;p=openwrt%2Fstaging%2Fstintel.git image: fix race between mkits.sh and mkimage in .itb squashfs generation With further investigation it was found a race in generating .itb images that include a RootFS caused by the mkits.sh and the mkimage. Due to the fact that mkits.sh generates a .pagesync image of the passed rootfs, it can happen that, concurrently, mkimage can be called at the same time mkits.sh is creating another .pagesync for the same rootfs. This cause mkimage to use an half made rootfs.pagesync creating a corrupted image. To address this, also protect the mkimage with the same lock used for mkits.sh preventing any kind of concurrent usage/generation of the rootfs.pagesync blob Fixes: 52cc9d82f113 ("kernel: rework Initramfs locking logic") Link: https://github.com/openwrt/openwrt/pull/20492 Signed-off-by: Christian Marangi --- diff --git a/include/image-commands.mk b/include/image-commands.mk index 7b2b346aa6..33c2ef89ad 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -450,7 +450,8 @@ define Build/fit -c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \ -A $(LINUX_KARCH) -v $(LINUX_VERSION), gen-cpio$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME)))) $(call locked,PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(findstring external,$(word 3,$(1))),\ - -E -B 0x1000 $(if $(findstring static,$(word 3,$(1))),-p 0x1000)) -f $@.its $@.new) + -E -B 0x1000 $(if $(findstring static,$(word 3,$(1))),-p 0x1000)) -f $@.its $@.new, \ + gen-cpio$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME)))) @mv $@.new $@ endef