neighbour: fix unaligned access to pneigh_entry
Subsystems (2)
PATCH 1/1 neighbour: fix unaligned access to pneigh_entry
From: Qingfang DENG <[email protected]>
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 2, this will trigger a crash when accessing an IPv6 pneigh_entry, as the key is cast to an in6_addr pointer.
Align the member to 4 bytes on said platforms.
--- include/net/neighbour.h | 4 ++++ 1 file changed, 4 insertions(+)
include/net/neighbour.h +4 -0
@@ -180,7 +180,11 @@ struct pneigh_entry {netdevice_tracker dev_tracker;u32 flags;u8 protocol; +#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS u8 key[]; +#else +u8 key[]__aligned(4) ; +#endif };/*
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerinclude/net/neighbour.h struct pneigh_entry { · line 187
Quoted 5 lines · On Wed, 31 May 2023 18:42:33 +0800 Qingfang DENG wrote:
include/net/neighbour.h +4
-0+#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS u8 key[]; +#else +u8 key[]__aligned(4) ; +#endif
I'd appreciate a second opinion, but to me it's very unlikely we'd save any memory even with efficient aligned access here. No reasonably key will fit into 3 bytes, right? So we can as well avoid the ifdef and make the key[] always aligned. Or preferably, if it doesn't cause compilation issues, make the type of the key u32?
Quoted 13 lines · Jakub Kicinski
include/net/neighbour.h struct pneigh_entry { · line 187
Quoted 5 lines · On Wed, 31 May 2023 18:42:33 +0800 Qingfang DENG wrote:
include/net/neighbour.h +4
-0+#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS u8 key[]; +#else +u8 key[]__aligned(4) ; +#endif I'd appreciate a second opinion, but to me it's very unlikely we'd save any memory even with efficient aligned access here. No reasonably key will fit into 3 bytes, right? So we can as well avoid the ifdef and make the key[] always aligned. Or preferably, if it doesn't cause compilation issues, make the type of the key u32?
Same feeling, we could avoid the CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS ifdef.
PATCH v2 1/1 neighbour: fix unaligned access to pneigh_entry
From: Qingfang DENG <[email protected]>
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.
---
v2: remove the ifdef, and use u32 type
include/net/neighbour.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/neighbour.h +1 -1
@@ -180,7 +180,7 @@ struct pneigh_entry {netdevice_tracker dev_tracker;u32 flags;u8 protocol; -u8 key[]; +u32 key[]; };/*
Signature · 1 line
2.34.1
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 1 Jun 2023 09:54:32 +0800 you wrote:
From: Qingfang DENG <[email protected]>
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_actionset to 1, this will trigger a crash when accessing an IPv6pneigh_entry, as the key is cast to anin6_addrpointer.[...]
Here is the summary with links:
- [net,v2] neighbour: fix unaligned access to pneigh_entry
https://git.kernel.org/netdev/net/c/ed779fe4c9b5
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html