netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pierre Ossman <drzeus@drzeus.cx>
To: davem@davemloft.net, netdev@vger.kernel.org
Subject: net: alignment problem in icmp code
Date: Sat, 20 Oct 2007 23:35:40 +0200	[thread overview]
Message-ID: <20071020233540.43d2f103@poseidon.drzeus.cx> (raw)

[-- Attachment #1: Type: text/plain, Size: 1132 bytes --]

Structure assignment have to be aligned just like any assignment, and the skb could point to anything. So take the safe route and use a memcpy().

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 272c69e..a7e2ec9 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -783,7 +783,7 @@ static void icmp_echo(struct sk_buff *skb)
 	if (!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(struct icmphdr));
 		icmp_param.data.icmph.type = ICMP_ECHOREPLY;
 		icmp_param.skb		   = skb;
 		icmp_param.offset	   = 0;
@@ -819,7 +819,7 @@ 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(struct icmphdr));
 	icmp_param.data.icmph.type = ICMP_TIMESTAMPREPLY;
 	icmp_param.data.icmph.code = 0;
 	icmp_param.skb		   = skb;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

             reply	other threads:[~2007-10-21  2:09 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-20 21:35 Pierre Ossman [this message]
2007-10-21  5:12 ` net: alignment problem in icmp code David Miller
2007-10-21  9:34   ` Pierre Ossman
2007-10-21 19:48     ` David Miller
2007-10-21 21:21       ` Pierre Ossman
2007-10-21 23:02         ` David Miller
2007-10-22  4:54           ` Pierre Ossman
2007-10-22  5:15             ` David Miller
2007-10-22  7:23               ` Pierre Ossman
2007-10-22  8:31                 ` David Miller
2007-10-22  8:42                   ` Pierre Ossman
2007-10-22  9:05                     ` David Miller
2007-10-22  9:26                       ` Pierre Ossman
2007-10-22  9:52                         ` Eric Dumazet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071020233540.43d2f103@poseidon.drzeus.cx \
    --to=drzeus@drzeus.cx \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).