diff options
| author |   Steffen Klassert <steffen.klassert@secunet.com> | 2012-07-05 03:18:28 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-07-05 14:20:07 -0700 |
| commit | a2de86f63cfc92f7aaf11e7b9d9f2150946a1622 (patch) | |
| tree | 770781fb05fd4816eba9597fa5aa435cfd3e1788 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-a2de86f63cfc92f7aaf11e7b9d9f2150946a1622.tar.xz linux-dev-a2de86f63cfc92f7aaf11e7b9d9f2150946a1622.zip | |
ipv6: Initialize the neighbour pointer of rt6_info on allocation
git commit 97cac082 (ipv6: Store route neighbour in rt6_info struct)
added a neighbour pointer to rt6_info. Currently we don't initialize
this pointer at allocation time. We assume this pointer to be valid
if it is not a null pointer, so initialize it on allocation.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index ceff71d24f8e..6cc6c881f54f 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -273,7 +273,7 @@ static inline struct rt6_info *ip6_dst_alloc(struct net *net, 0, 0, flags); if (rt) { - memset(&rt->rt6i_table, 0, + memset(&rt->n, 0, sizeof(*rt) - sizeof(struct dst_entry)); rt6_init_peer(rt, table ? &table->tb6_peers : net->ipv6.peers); } |