From 2437df95770a03bd0cfd101392a8c5c5adb7a6bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?=
 =?UTF-8?q?=E6=98=8E?= <yoshfuji@linux-ipv6.org>
Date: Tue, 8 Jan 2013 06:44:23 +0000
Subject: [PATCH] --- yaml --- r: 351329 b: refs/heads/master c:
 6c40d100ce3311a44ef82c678fb46833a270c007 h: refs/heads/master i:   351327:
 df5cafbe600c6a06ca02f201ccebd48855f1d012 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/datagram.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2c620f943234..21dfedf01167 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29166107fd34a4d180c1adaaaccab0c050defc2e
+refs/heads/master: 6c40d100ce3311a44ef82c678fb46833a270c007
diff --git a/trunk/net/ipv6/datagram.c b/trunk/net/ipv6/datagram.c
index 8edf2601065a..56b692bb94a7 100644
--- a/trunk/net/ipv6/datagram.c
+++ b/trunk/net/ipv6/datagram.c
@@ -356,12 +356,11 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)
 		sin->sin6_port = serr->port;
 		sin->sin6_scope_id = 0;
 		if (skb->protocol == htons(ETH_P_IPV6)) {
-			sin->sin6_addr =
-				*(struct in6_addr *)(nh + serr->addr_offset);
+			const struct ipv6hdr *ip6h = container_of((struct in6_addr *)(nh + serr->addr_offset),
+								  struct ipv6hdr, daddr);
+			sin->sin6_addr = ip6h->daddr;
 			if (np->sndflow)
-				sin->sin6_flowinfo =
-					(*(__be32 *)(nh + serr->addr_offset - 24) &
-					 IPV6_FLOWINFO_MASK);
+				sin->sin6_flowinfo = *(__be32 *)ip6h & IPV6_FLOWINFO_MASK;
 			if (ipv6_addr_type(&sin->sin6_addr) & IPV6_ADDR_LINKLOCAL)
 				sin->sin6_scope_id = IP6CB(skb)->iif;
 		} else {