diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-28 14:31:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-28 22:26:00 -0700 |
| commit | cf91166223772ef4a2ed98b9874958bf6a2470df (patch) | |
| tree | f8c86cc60798db9e4469031a8dceb5fcb512fb81 /net/ipv6/route.c | |
| parent | 5c1e6aa300a7a669dc469d2dcb20172c6bd8fed9 (diff) | |
| download | kernel_samsung_smdk4412-cf91166223772ef4a2ed98b9874958bf6a2470df.zip kernel_samsung_smdk4412-cf91166223772ef4a2ed98b9874958bf6a2470df.tar.gz kernel_samsung_smdk4412-cf91166223772ef4a2ed98b9874958bf6a2470df.tar.bz2 | |
net: Use non-zero allocations in dst_alloc().
Make dst_alloc() and it's users explicitly initialize the entire
entry.
The zero'ing done by kmem_cache_zalloc() was almost entirely
redundant.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e8b2bb9..f1be5c5 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -230,7 +230,11 @@ static struct rt6_info ip6_blk_hole_entry_template = { static inline struct rt6_info *ip6_dst_alloc(struct dst_ops *ops, struct net_device *dev) { - return (struct rt6_info *)dst_alloc(ops, dev, 0, 0, 0); + struct rt6_info *rt = dst_alloc(ops, dev, 0, 0, 0); + + memset(&rt->rt6i_table, 0, sizeof(*rt) - sizeof(struct dst_entry)); + + return rt; } static void ip6_dst_destroy(struct dst_entry *dst) @@ -887,6 +891,8 @@ struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_ori rt = dst_alloc(&ip6_dst_blackhole_ops, ort->dst.dev, 1, 0, 0); if (rt) { + memset(&rt->rt6i_table, 0, sizeof(*rt) - sizeof(struct dst_entry)); + new = &rt->dst; new->__use = 1; |