Merge pull request #9025 from HiassofT/le12-kernel-6.6.35

[le12] linux (RPi): update to 6.6.35
This commit is contained in:
Christian Hewitt 2024-06-25 15:26:58 +04:00 committed by GitHub
commit 7737b625c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 44 deletions

View File

@ -23,8 +23,8 @@ case "${LINUX}" in
PKG_PATCH_DIRS="default" PKG_PATCH_DIRS="default"
;; ;;
raspberrypi) raspberrypi)
PKG_VERSION="51c5d2bb01d3a0cff31d00686f35ed8f33039f78" # 6.6.33 PKG_VERSION="d2813c02131b9ddf938277f4123da7ccbd113ea7" # 6.6.35
PKG_SHA256="0e2ca3b34312b1527aa9d380761af2ab1ec7754ae4481b0317fa144d4b060501" PKG_SHA256="a443bcb9f4548db18b8774e448ed4ed811abc26b32cf017e0ae691abc2789db9"
PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
;; ;;

View File

@ -1,37 +0,0 @@
From bc49e7136a4bb926bb8743531ae54cc0c721e402 Mon Sep 17 00:00:00 2001
From: Dom Cobley <popcornmix@gmail.com>
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 <popcornmix@gmail.com>
---
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 ||

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # 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_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # 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_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -323,7 +323,6 @@ CONFIG_ARCH_BCM=y
# #
CONFIG_ARCH_BCM2835=y CONFIG_ARCH_BCM2835=y
# CONFIG_ARCH_BCM_53573 is not set # CONFIG_ARCH_BCM_53573 is not set
# CONFIG_ARCH_BCM_63XX is not set
# CONFIG_ARCH_BRCMSTB is not set # CONFIG_ARCH_BRCMSTB is not set
# CONFIG_ARCH_BCMBCA is not set # CONFIG_ARCH_BCMBCA is not set

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # 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_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # 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_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y