From bceae83e8cc33735857e474f3d5621ea5597ba48 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 20 Sep 2012 18:29:56 +0000
Subject: [PATCH] --- yaml --- r: 323098 b: refs/heads/master c:
 f950c0ecc78f745e490d615280e031de4dbb1306 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv6/ip6_fib.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6584c53d594f..969aae766a16 100644
--- 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
index 13690d650c3e..286acfc21250 100644
--- 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