[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Thu, 5 Apr 2012 01:09:48 +0200
From: Arvid Brodin <arvid.brodin@...a.com>
To: Stephen Hemminger <shemminger@...tta.com>
CC: "David S. Miller" <davem@...emloft.net>, <netdev@...r.kernel.org>,
Bruno Ferreira <balferreira@...glemail.com>,
Arvid Brodin <arvid.brodin@...n.com>
Subject: Re: [RFC] net/hsr: Add support for IEC 62439-3 High-availability
Seamless Redundancy
Stephen Hemminger wrote:
> On Tue, 27 Mar 2012 15:20:45 +0200
> Arvid Brodin <arvid.brodin@...a.com> wrote:
>
>> +config NONSTANDARD_HSR
>> + bool "HSR: Use efficient tag (breaks HSR standard, read help!)"
>> + depends on HSR
>> + ---help---
>> + The HSR standard specifies a 6-byte HSR tag to be inserted into the
>> + transmitted network frames. This breaks the 32-bit alignment that the
>> + Linux network stack relies on, and would cause kernel panics on
>> + certain architectures. To avoid this, the whole frame payload is
>> + memmoved 2 bytes on reception on these architectures - which is very
>> + inefficient!
>
> This option won't fly. Don't do it.
> If you need to copy/realign packets on some architecture the stack
> should be changed to handle it.
Ok. The problems are in net/ipv4/icmp.c. The below patch seems to do
the trick for me - does it look OK (and if so, should I resend it as
a normal patch instead of a reply or is this enough)?
Note that I've only triggered this problem in icmp_echo(), but I
noticed that icmp_timestamp() does the same thing, so I made the change
there too.
[PATCH] net/ipv4/icmp: Fix kernel panic due to unaligned access with HSR on AVR32
icmp_echo() and icmp_timestamp() requires the icmphdr struct to be
32-bit aligned. This causes a kernel panic on AVR32 when HSR is used,
since the HSR protocol inserts a 6-byte "HSR tag" into Ethernet frame
headers, thus changing the alignment.
HSR = IEC 62439-3 High-availability Seamless Redundancy.
Signed-off-by: Arvid Brodin <arvid.brodin@...n.com>
---
net/ipv4/icmp.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 2cb2bf8..fdd8097 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -818,7 +818,8 @@ static void icmp_echo(struct sk_buff *skb)
if (!net->ipv4.sysctl_icmp_echo_ignore_all) {
struct icmp_bxm icmp_param;
- icmp_param.data.icmph = *icmp_hdr(skb);
+ memcpy(&icmp_param.data.icmph, icmp_hdr(skb),
+ sizeof(icmp_param.data.icmph));
icmp_param.data.icmph.type = ICMP_ECHOREPLY;
icmp_param.skb = skb;
icmp_param.offset = 0;
@@ -854,7 +855,8 @@ static void icmp_timestamp(struct sk_buff *skb)
icmp_param.data.times[2] = icmp_param.data.times[1];
if (skb_copy_bits(skb, 0, &icmp_param.data.times[0], 4))
BUG();
- icmp_param.data.icmph = *icmp_hdr(skb);
+ memcpy(&icmp_param.data.icmph, icmp_hdr(skb),
+ sizeof(icmp_param.data.icmph));
icmp_param.data.icmph.type = ICMP_TIMESTAMPREPLY;
icmp_param.data.icmph.code = 0;
icmp_param.skb = skb;
--
1.6.3.3
--
Arvid Brodin
Enea Services Stockholm AB - since February 16 a part of Xdin in the Alten
Group. Soon we will be working under the common brand Xdin. Read more at
www.xdin.com.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists