---

yaml --- r: 323098 b: refs/heads/master c: f950c0e h: refs/heads/master v: v3
git-mirror · Sep 21, 2012 · bceae83 · bceae83
1 parent 5e7e03b
commit bceae83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 185d4c8bf579322e1c2835d70729bc30f6f80f55
+refs/heads/master: f950c0ecc78f745e490d615280e031de4dbb1306
diff --git a/trunk/net/ipv6/ip6_fib.c b/trunk/net/ipv6/ip6_fib.c
@@ -819,6 +819,10 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
 					offsetof(struct rt6_info, rt6i_src),
 					allow_create, replace_required);
 
+			if (IS_ERR(sn)) {
+				err = PTR_ERR(sn);
+				sn = NULL;
+			}
 			if (!sn) {
 				/* If it is failed, discard just allocated
 				   root, and then (in st_failure) stale node