Skip to content

Commit

Permalink
ipv6: Initialize the struct rt6_info behind the dst_enty field
Browse files Browse the repository at this point in the history
We start initializing the struct rt6_info at the first field
behind the struct dst_enty. This is error prone because it
might leave a new field uninitialized. So start initializing
the struct rt6_info right behind the dst_entry.

Suggested-by: Eric Dumazet <[email protected]>
Signed-off-by: Steffen Klassert <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
klassert authored and davem330 committed Jul 14, 2012
1 parent 921a678 commit 8104891
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions net/ipv6/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,9 @@ static inline struct rt6_info *ip6_dst_alloc(struct net *net,
0, 0, flags);

if (rt) {
memset(&rt->n, 0,
sizeof(*rt) - sizeof(struct dst_entry));
struct dst_entry *dst = &rt->dst;

memset(dst + 1, 0, sizeof(*rt) - sizeof(*dst));
rt6_init_peer(rt, table ? &table->tb6_peers : net->ipv6.peers);
}
return rt;
Expand Down Expand Up @@ -982,11 +983,11 @@ 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));
rt6_init_peer(rt, net->ipv6.peers);

new = &rt->dst;

memset(new + 1, 0, sizeof(*rt) - sizeof(*new));
rt6_init_peer(rt, net->ipv6.peers);

new->__use = 1;
new->input = dst_discard;
new->output = dst_discard;
Expand Down

0 comments on commit 8104891

Please sign in to comment.