From b56fe54c2acc59d5d21f7ed2b9071ed7143e3a65 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 24 Jun 2024 18:41:11 +0200 Subject: [PATCH 1/4] linux (RPi): update to 6.6.35-5263478 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 79114b4120..d605bebdcc 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default rtlwifi/6.10 rtlwifi/6.11" ;; raspberrypi) - PKG_VERSION="f54dbddefe179433c73ad6611ada5b25d452ce05" # 6.6.34 - PKG_SHA256="229cae163c76c11f85d6d952e9ac750dbf3efd312f7986d3f3f241a1f4222309" + PKG_VERSION="5263478665260ec207b8ee4751401c1d4a6a514a" # 6.6.35 + PKG_SHA256="67b87a09383475f6796b0031b78a01fca131618d069db64fdf93ee89d34f494c" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="raspberrypi rtlwifi/6.9 rtlwifi/6.10 rtlwifi/6.11" From 1a662ca661606f006da4b9aae4034606c1087199 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 24 Jun 2024 18:41:45 +0200 Subject: [PATCH 2/4] linux (RPi): drop ntfs3 corruption patch This commit is included in the current kernel Signed-off-by: Matthias Reichl --- .../linux-999.99-fix-ntfs3-corruption.patch | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 packages/linux/patches/raspberrypi/linux-999.99-fix-ntfs3-corruption.patch diff --git a/packages/linux/patches/raspberrypi/linux-999.99-fix-ntfs3-corruption.patch b/packages/linux/patches/raspberrypi/linux-999.99-fix-ntfs3-corruption.patch deleted file mode 100644 index 624c30f12d..0000000000 --- a/packages/linux/patches/raspberrypi/linux-999.99-fix-ntfs3-corruption.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bc49e7136a4bb926bb8743531ae54cc0c721e402 Mon Sep 17 00:00:00 2001 -From: Dom Cobley -Date: Tue, 11 Jun 2024 16:12:47 +0100 -Subject: [PATCH] fs/ntfs3: Fix memory corruption when page_size changes - -The rework in fs/ntfs3: Reduce stack usage -changes log->page_size but doesn't change the associated -log->page_mask and log->page_bits. - -That results in the bytes value in read_log_page -getting a negative value, which is bad when it is -passed to memcpy. - -The kernel panic can be observed when connecting an -ntfs formatted drive that has previously been connected -to a Windows machine to a Raspberry Pi 5, which by defauilt -uses a 16K kernel pagesize. - -Fixes: 865e7a7700d9 ("fs/ntfs3: Reduce stack usage") -Signed-off-by: Dom Cobley ---- - fs/ntfs3/fslog.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c -index 855519713bf79..b3b83565365e3 100644 ---- a/fs/ntfs3/fslog.c -+++ b/fs/ntfs3/fslog.c -@@ -3906,6 +3906,8 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) - log->l_size = log->orig_file_size; - log->page_size = norm_file_page(t32, &log->l_size, - t32 == DefaultLogPageSize); -+ log->page_mask = log->page_size - 1; -+ log->page_bits = blksize_bits(log->page_size); - } - - if (log->page_size != t32 || From 23a88eec191b28abbc645725e72326efcdde6b97 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 24 Jun 2024 18:41:11 +0200 Subject: [PATCH 3/4] linux (RPi): config options for 6.6.35-5263478 Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 2 +- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 +-- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 2 +- projects/RPi/devices/RPi5/linux/linux.aarch64.conf | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 000d5a2070..257da6047b 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.6.33 Kernel Configuration +# Linux/arm 6.6.35 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 53a53bafc0..78cb545434 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.6.33 Kernel Configuration +# Linux/arm 6.6.35 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -323,7 +323,6 @@ CONFIG_ARCH_BCM=y # CONFIG_ARCH_BCM2835=y # CONFIG_ARCH_BCM_53573 is not set -# CONFIG_ARCH_BCM_63XX is not set # CONFIG_ARCH_BRCMSTB is not set # CONFIG_ARCH_BCMBCA is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index 9ff5e98c38..e91ec94f7e 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.33 Kernel Configuration +# Linux/arm64 6.6.35 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y diff --git a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf index dfa3a2493c..e55d8484d1 100644 --- a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.33 Kernel Configuration +# Linux/arm64 6.6.35 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y From 8559627efeb7a0a4e7efd9513f820d07e09f983b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 25 Jun 2024 11:35:49 +0200 Subject: [PATCH 4/4] linux (RPi): update to 6.6.35-d2813c0 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index d605bebdcc..0d443ef4d9 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default rtlwifi/6.10 rtlwifi/6.11" ;; raspberrypi) - PKG_VERSION="5263478665260ec207b8ee4751401c1d4a6a514a" # 6.6.35 - PKG_SHA256="67b87a09383475f6796b0031b78a01fca131618d069db64fdf93ee89d34f494c" + PKG_VERSION="d2813c02131b9ddf938277f4123da7ccbd113ea7" # 6.6.35 + PKG_SHA256="a443bcb9f4548db18b8774e448ed4ed811abc26b32cf017e0ae691abc2789db9" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="raspberrypi rtlwifi/6.9 rtlwifi/6.10 rtlwifi/6.11"