diff --git a/Patchlist.changelog b/Patchlist.changelog index 488232e91..89c5b5769 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/b7fa9471cabdd3c028d1a18c2628e903a7cb7b0b + b7fa9471cabdd3c028d1a18c2628e903a7cb7b0b erofs: fix file-backed mounts no longer working on EROFS partitions + +https://gitlab.com/cki-project/kernel-ark/-/commit/68087a6ec519be4a05701225575b7b816a972a28 + 68087a6ec519be4a05701225575b7b816a972a28 erofs: don't bother with s_stack_depth increasing for now + https://gitlab.com/cki-project/kernel-ark/-/commit/1aa8379a46cab537e582c4ed2fec5ac14e1fd732 1aa8379a46cab537e582c4ed2fec5ac14e1fd732 wifi: iwlwifi: Fix firmware version handling diff --git a/kernel.changelog b/kernel.changelog index 41dae540f..660ad720c 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,9 @@ +* Sun Jan 11 2026 Justin M. Forbes [6.18.5-0] +- erofs: fix file-backed mounts no longer working on EROFS partitions (Gao Xiang) +- erofs: don't bother with s_stack_depth increasing for now (Gao Xiang) +- Linux v6.18.5 +Resolves: + * Thu Jan 08 2026 Justin M. Forbes [6.18.4-0] - Linux v6.18.4 Resolves: diff --git a/kernel.spec b/kernel.spec index 8df9a594f..2af40f147 100644 --- a/kernel.spec +++ b/kernel.spec @@ -173,18 +173,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.18.4 -%define specversion 6.18.4 +%define specrpmversion 6.18.5 +%define specversion 6.18.5 %define patchversion 6.18 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.18.4 +%define tarfile_release 6.18.5 # This is needed to do merge window version magic %define patchlevel 18 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.18.4 +%define kabiversion 6.18.5 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4510,6 +4510,11 @@ fi\ # # %changelog +* Sun Jan 11 2026 Justin M. Forbes [6.18.5-0] +- erofs: fix file-backed mounts no longer working on EROFS partitions (Gao Xiang) +- erofs: don't bother with s_stack_depth increasing for now (Gao Xiang) +- Linux v6.18.5 + * Thu Jan 08 2026 Justin M. Forbes [6.18.4-0] - Linux v6.18.4 diff --git a/patch-6.18-redhat.patch b/patch-6.18-redhat.patch index e0890f5c7..a86e929d8 100644 --- a/patch-6.18-redhat.patch +++ b/patch-6.18-redhat.patch @@ -26,6 +26,7 @@ drivers/pci/quirks.c | 24 ++++ drivers/scsi/sd.c | 10 ++ drivers/usb/core/hub.c | 7 ++ + fs/erofs/super.c | 19 +++- include/linux/efi.h | 22 ++-- include/linux/lsm_hook_defs.h | 1 + include/linux/module.h | 1 + @@ -41,10 +42,10 @@ security/lockdown/lockdown.c | 11 ++ tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 ------ - 43 files changed, 550 insertions(+), 216 deletions(-) + 44 files changed, 563 insertions(+), 222 deletions(-) diff --git a/Makefile b/Makefile -index 7b431af09b32..c68c3acc0033 100644 +index 30c332829b0f..fb93f8fdd6a0 100644 --- a/Makefile +++ b/Makefile @@ -355,6 +355,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) @@ -1206,6 +1207,38 @@ index 256fe8c86828..2e4a09948df8 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); +diff --git a/fs/erofs/super.c b/fs/erofs/super.c +index 937a215f626c..5136cda5972a 100644 +--- a/fs/erofs/super.c ++++ b/fs/erofs/super.c +@@ -644,14 +644,21 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) + * fs contexts (including its own) due to self-controlled RO + * accesses/contexts and no side-effect changes that need to + * context save & restore so it can reuse the current thread +- * context. However, it still needs to bump `s_stack_depth` to +- * avoid kernel stack overflow from nested filesystems. ++ * context. ++ * However, we still need to prevent kernel stack overflow due ++ * to filesystem nesting: just ensure that s_stack_depth is 0 ++ * to disallow mounting EROFS on stacked filesystems. ++ * Note: s_stack_depth is not incremented here for now, since ++ * EROFS is the only fs supporting file-backed mounts for now. ++ * It MUST change if another fs plans to support them, which ++ * may also require adjusting FILESYSTEM_MAX_STACK_DEPTH. + */ + if (erofs_is_fileio_mode(sbi)) { +- sb->s_stack_depth = +- file_inode(sbi->dif0.file)->i_sb->s_stack_depth + 1; +- if (sb->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) { +- erofs_err(sb, "maximum fs stacking depth exceeded"); ++ inode = file_inode(sbi->dif0.file); ++ if ((inode->i_sb->s_op == &erofs_sops && ++ !inode->i_sb->s_bdev) || ++ inode->i_sb->s_stack_depth) { ++ erofs_err(sb, "file-backed mounts cannot be applied to stacked fses"); + return -ENOTBLK; + } + } diff --git a/include/linux/efi.h b/include/linux/efi.h index a98cc39e7aaa..00f31eefd0c5 100644 --- a/include/linux/efi.h diff --git a/sources b/sources index 337aeed4a..3f9ad79ae 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.18.4.tar.xz) = 64b76e1414c917cbc62c1946524913b0a6249b4e0d63c0e14e5a8f77ca4e2b4cf3b57baed0f8014dee0661dd964b2c2f8e3aa2c9b7bc74e50326d77327ffe3ec -SHA512 (kernel-abi-stablelists-6.18.4.tar.xz) = eb6c2a0b9affc91835b34ffa1d9efc74ce099983e7f9454f08fa75c8e398d24ef30e8d2ee119059f26aaa9ff54623035a92e996283e116f087865703880ecbc2 -SHA512 (kernel-kabi-dw-6.18.4.tar.xz) = ecbb500f6548f2df9478000b3fa3719acd4da47a8127109c41fd5397d84a48397c117563f867e2da902bbb83332b9186098b8dc0f531a919a0bd9ad64dfe1ab4 +SHA512 (linux-6.18.5.tar.xz) = 277dd335702957c7bec4f579dc55e1dc860bcb1ff18f426659eb6f1bc92572c5919240950281e009a2cbb2078a8f1ba5753845466dd959583410735c49a2b9e7 +SHA512 (kernel-abi-stablelists-6.18.5.tar.xz) = c346d96e0a1bb75c42648e9cca4f26142ca8de47a705247481f351b309334354a60ae543c75baba5c0ee6e6f241de648a927adb9c6b0e9d44865cc3de146bb69 +SHA512 (kernel-kabi-dw-6.18.5.tar.xz) = e8ac276320257fc6183e50c4ad0cdf2b823805d8d51cc225dff3b8442f0ff34fa3fb183c18b900e236448cd34e21a5220a8515d883082a32f2cfd381044aee36