---

yaml --- r: 264166 b: refs/heads/master c: fbe5818 h: refs/heads/master v: v3
git-mirror · Sep 27, 2011 · afe5998 · afe5998
1 parent 86e3ca8
commit afe5998
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4cae56219755ccf8acfc8e2c1927009ff29d8c6
+refs/heads/master: fbe58186901155c0cb5398dd343337be0c456c04
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -244,7 +244,9 @@ static inline struct rt6_info *ip6_dst_alloc(struct dst_ops *ops,
 {
 	struct rt6_info *rt = dst_alloc(ops, dev, 0, 0, flags);
 
-	memset(&rt->rt6i_table, 0, sizeof(*rt) - sizeof(struct dst_entry));
+	if (rt != NULL)
+		memset(&rt->rt6i_table, 0,
+			sizeof(*rt) - sizeof(struct dst_entry));
 
 	return rt;
 }