--- /dev/null
+From ed779fe4c9b5a20b4ab4fd6f3e19807445bb78c7 Mon Sep 17 00:00:00 2001
+From: Qingfang DENG <qingfang.deng@siflower.com.cn>
+Date: Thu, 1 Jun 2023 09:54:32 +0800
+Subject: neighbour: fix unaligned access to pneigh_entry
+
+From: Qingfang DENG <qingfang.deng@siflower.com.cn>
+
+commit ed779fe4c9b5a20b4ab4fd6f3e19807445bb78c7 upstream.
+
+After the blamed commit, the member key is longer 4-byte aligned. On
+platforms that do not support unaligned access, e.g., MIPS32R2 with
+unaligned_action set to 1, this will trigger a crash when accessing
+an IPv6 pneigh_entry, as the key is cast to an in6_addr pointer.
+
+Change the type of the key to u32 to make it aligned.
+
+Fixes: 62dd93181aaa ("[IPV6] NDISC: Set per-entry is_router flag in Proxy NA.")
+Signed-off-by: Qingfang DENG <qingfang.deng@siflower.com.cn>
+Link: https://lore.kernel.org/r/20230601015432.159066-1-dqfext@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/net/neighbour.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/net/neighbour.h
++++ b/include/net/neighbour.h
+@@ -172,7 +172,7 @@ struct pneigh_entry {
+ possible_net_t net;
+ struct net_device *dev;
+ u8 flags;
+- u8 key[0];
++ u32 key[0];
+ };
+
+ /*
mmc-core-do-not-force-a-retune-before-rpmb-switch.patch
nilfs2-fix-use-after-free-of-timer-for-log-writer-thread.patch
vxlan-fix-regression-when-dropping-packets-due-to-invalid-src-addresses.patch
+neighbour-fix-unaligned-access-to-pneigh_entry.patch