]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
ramips: a workaround for system halt issue on 6.12 kernel 18654/head
authorShiji Yang <yangshiji66@outlook.com>
Fri, 30 May 2025 12:24:32 +0000 (20:24 +0800)
committerHauke Mehrtens <hauke@hauke-m.de>
Wed, 11 Jun 2025 12:16:21 +0000 (14:16 +0200)
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>
target/linux/ramips/patches-6.12/325-MIPS-checksum-check-if-data-length-is-zero-in-ip_fas.patch [new file with mode: 0644]

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 (file)
index 0000000..6e78dd7
--- /dev/null
@@ -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]);