diff options
| author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-08 07:44:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-10 08:59:53 +0100 |
| commit | 6c40d100ce3311a44ef82c678fb46833a270c007 (patch) | |
| tree | c520c66ae178d627904c848941d2161d6260a4dd | |
| parent | bnx2x: NULL dereference on error in debug code (diff) | |
| download | linux-6c40d100ce3311a44ef82c678fb46833a270c007.tar.xz linux-6c40d100ce3311a44ef82c678fb46833a270c007.zip | |
ipv6: Use container_of macro instead of magic number to get ipv6 header.
In ipv6_recv_error(), addr_offset points to daddr field of the ip header.
To get ipv6 header, use container_of() macro instead of substracting magic
number (24).
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/datagram.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 8edf2601065a..56b692bb94a7 100644 --- a/net/ipv6/datagram.c +++ b/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 { |