the layer7 patch is rebased to apply without fuzzing.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org --- config/kernel/kernel.config.aarch64-ipfire | 9 +++++---- config/kernel/kernel.config.x86_64-ipfire | 3 +-- lfs/linux | 6 +++--- ...{linux-6.1-layer7.patch => linux-6.1.27-layer7.patch} | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) rename src/patches/linux/{linux-6.1-layer7.patch => linux-6.1.27-layer7.patch} (99%)
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 92f2bca60..74ff773df 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.24-ipfire Kernel Configuration +# Linux/arm64 6.1.27-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -158,7 +158,6 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y @@ -407,6 +406,7 @@ CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_HW_PERF_EVENTS=y +CONFIG_CC_HAVE_SHADOW_CALL_STACK=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_KEXEC_FILE is not set @@ -693,6 +693,8 @@ CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y +# CONFIG_SHADOW_CALL_STACK is not set CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y CONFIG_LTO_NONE=y @@ -6989,7 +6991,6 @@ CONFIG_DMA_SUN6I=y # CONFIG_DW_AXI_DMAC is not set CONFIG_FSL_EDMA=m CONFIG_FSL_QDMA=m -# CONFIG_HISI_DMA is not set CONFIG_IMX_DMA=m CONFIG_IMX_SDMA=m # CONFIG_INTEL_IDMA64 is not set @@ -7735,7 +7736,6 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y # CONFIG_HUGETLBFS is not set -CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=m @@ -8681,6 +8681,7 @@ CONFIG_IO_STRICT_DEVMEM=y # CONFIG_FAULT_INJECTION is not set CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 867e99e9f..db0271d94 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.24-ipfire Kernel Configuration +# Linux/x86 6.1.27-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -178,7 +178,6 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y diff --git a/lfs/linux b/lfs/linux index e48374f1e..1ee07e467 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@
include Config
-VER = 6.1.24 +VER = 6.1.27 ARM_PATCHES = 6.1.y-ipfire1
THISAPP = linux-$(VER) @@ -75,7 +75,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_BLAKE2 = 2f20ad999655226bc79caca109bde0f940420d87a293cf000f2d8304122bdfcc388c1a558ff26f2f551c9b6133b8fb120dbd537f914e1b88d0fbbd5408e648b0 +$(DL_FILE)_BLAKE2 = 5d7ec9a6a2652abbe4afb70174a63f58d495291d522087f9adb33864063ce54e219fd6e426793077a346338ccb4d9d753a60cb76b448146fb592ff17c2618792 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 2181ba20d1c9d2752d67438784da12470f5c9cb8acc4eb748637ae1e8bf9d7cd0e7a08a51fad5cac98764d46ae6a20521ddda31da7002d48dbd180ff04a4d9aa
install : $(TARGET) @@ -113,7 +113,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -svf linux-$(VER) $(DIR_SRC)/linux
# Layer7-patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.1-layer7.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.1.27-layer7.patch
# DVB Patches cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch diff --git a/src/patches/linux/linux-6.1-layer7.patch b/src/patches/linux/linux-6.1.27-layer7.patch similarity index 99% rename from src/patches/linux/linux-6.1-layer7.patch rename to src/patches/linux/linux-6.1.27-layer7.patch index 71f120cb0..00e0ca4c2 100644 --- a/src/patches/linux/linux-6.1-layer7.patch +++ b/src/patches/linux/linux-6.1.27-layer7.patch @@ -1,8 +1,8 @@ diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 7be5bb4c94b6..9a86f7bdbfce 100644 +index 20ca1613f2e3..8024f760bbe1 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -891,6 +891,9 @@ struct sk_buff { +@@ -892,6 +892,9 @@ struct sk_buff {
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) unsigned long _nfct; @@ -103,7 +103,7 @@ index 0f060d100880..28a7d4f8be40 100644 obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c -index 23b3fedd619a..5fa552543967 100644 +index 30ed45b1b57d..2f4640fcb6bd 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -604,6 +604,11 @@ void nf_ct_destroy(struct nf_conntrack *nfct) @@ -119,7 +119,7 @@ index 23b3fedd619a..5fa552543967 100644 nf_ct_put(ct->master);
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c -index bca839ab1ae8..69fb7b8296a2 100644 +index 460294bd4b60..b1e4b9c6d2a4 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -373,6 +373,11 @@ static int ct_seq_show(struct seq_file *s, void *v)