5.15-stable patches

added patches:
	kbuild-use-crc32-and-a-1mib-dictionary-for-xz-compressed-modules.patch

diff --git a/queue-5.15/kbuild-use-crc32-and-a-1mib-dictionary-for-xz-compressed-modules.patch b/queue-5.15/kbuild-use-crc32-and-a-1mib-dictionary-for-xz-compressed-modules.patch
new file mode 100644 (file)
index 0000000..8ced6f0
--- /dev/null
+++ b/queue-5.15/kbuild-use-crc32-and-a-1mib-dictionary-for-xz-compressed-modules.patch
@@ -0,0 +1,39 @@
+From fbf5892df21a8ccfcb2fda0fd65bc3169c89ed28 Mon Sep 17 00:00:00 2001
+From: Martin Nybo Andersen <tweek@tweek.dk>
+Date: Fri, 15 Sep 2023 12:15:39 +0200
+Subject: kbuild: Use CRC32 and a 1MiB dictionary for XZ compressed modules
+
+From: Martin Nybo Andersen <tweek@tweek.dk>
+
+commit fbf5892df21a8ccfcb2fda0fd65bc3169c89ed28 upstream.
+
+Kmod is now (since kmod commit 09c9f8c5df04 ("libkmod: Use kernel
+decompression when available")) using the kernel decompressor, when
+loading compressed modules.
+
+However, the kernel XZ decompressor is XZ Embedded, which doesn't
+handle CRC64 and dictionaries larger than 1MiB.
+
+Use CRC32 and 1MiB dictionary when XZ compressing and installing
+kernel modules.
+
+Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050582
+Signed-off-by: Martin Nybo Andersen <tweek@tweek.dk>
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Cc: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ scripts/Makefile.modinst |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/scripts/Makefile.modinst
++++ b/scripts/Makefile.modinst
+@@ -95,7 +95,7 @@ endif
+ quiet_cmd_gzip = GZIP    $@
+       cmd_gzip = $(KGZIP) -n -f $<
+ quiet_cmd_xz = XZ      $@
+-      cmd_xz = $(XZ) --lzma2=dict=2MiB -f $<
++      cmd_xz = $(XZ) --check=crc32 --lzma2=dict=1MiB -f $<
+ quiet_cmd_zstd = ZSTD    $@
+       cmd_zstd = $(ZSTD) -T0 --rm -f -q $<
+ 

diff --git a/queue-5.15/series b/queue-5.15/series
index a79ba7faa22754bf7120dc2e6d897c6c307582cb..a0f25932c3a194cafc1de16d7c9fc7d6918ee58e 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -420,3 +420,4 @@ mm-damon-tests-core-kunit-handle-alloc-failures-on-damon_test_merge_two.patch
 mm-damon-tests-core-kunit-handle-memory-failure-from-damon_test_target.patch
 mm-damon-tests-core-kunit-handle-alloc-failures-on-damon_test_split_regions_of.patch
 mm-damon-tests-core-kunit-handle-memory-alloc-failure-from-damon_test_aggregate.patch
+kbuild-use-crc32-and-a-1mib-dictionary-for-xz-compressed-modules.patch