summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiji Yang2025-05-30 12:24:32 +0000
committerHauke Mehrtens2025-06-11 12:16:21 +0000
commit09c2ceb7a5b279634e0295c11709d78b8177bbfd (patch)
tree4c0dd2b6f52375d02bbaf82c32cd29c9f7c2f5da
parent4f62facf107ed3e252f105d4c2c78182e213071a (diff)
downloadopenwrt-09c2ceb7a5b279634e0295c11709d78b8177bbfd.tar.gz
ramips: a workaround for system halt issue on 6.12 kernel
Fix potential invalid memory address access on ip_fast_csum(). Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/18654 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/ramips/patches-6.12/325-MIPS-checksum-check-if-data-length-is-zero-in-ip_fas.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-6.12/325-MIPS-checksum-check-if-data-length-is-zero-in-ip_fas.patch b/target/linux/ramips/patches-6.12/325-MIPS-checksum-check-if-data-length-is-zero-in-ip_fas.patch
new file mode 100644
index 0000000000..6e78dd7199
--- /dev/null
+++ b/target/linux/ramips/patches-6.12/325-MIPS-checksum-check-if-data-length-is-zero-in-ip_fas.patch
@@ -0,0 +1,28 @@
+From e34037bd3df9d80c96eda35d346a9220c71a3459 Mon Sep 17 00:00:00 2001
+From: Shiji Yang <yangshiji66@outlook.com>
+Date: Fri, 30 May 2025 19:56:16 +0800
+Subject: [PATCH] MIPS: checksum: check if data length is zero in
+ ip_fast_csum()
+
+If ihl equals 0, the nonsensical infinite do while loop will
+eventually access an invalid memory address, which will cause
+the system to halt.
+
+Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+---
+ arch/mips/include/asm/checksum.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/mips/include/asm/checksum.h
++++ b/arch/mips/include/asm/checksum.h
+@@ -101,6 +101,10 @@ static inline __sum16 ip_fast_csum(const
+ unsigned int csum;
+ int carry;
+
++ /* ihl should never be zero */
++ if (unlikely(ihl == 0))
++ return 0;
++
+ csum = word[0];
+ csum += word[1];
+ carry = (csum < word[1]);