summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-20 18:29:56 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-21 13:43:52 -0400
commitf950c0ecc78f745e490d615280e031de4dbb1306 (patch)
tree7c3605b8ac3f8066bba52407c505fc83b3f338e8
parent185d4c8bf579322e1c2835d70729bc30f6f80f55 (diff)
downloadlinux-3.10-f950c0ecc78f745e490d615280e031de4dbb1306.tar.gz
linux-3.10-f950c0ecc78f745e490d615280e031de4dbb1306.tar.bz2
linux-3.10-f950c0ecc78f745e490d615280e031de4dbb1306.zip
ipv6: fix return value check in fib6_add()
In case of error, the function fib6_add_1() returns ERR_PTR() or NULL pointer. The ERR_PTR() case check is missing in fib6_add(). dpatch engine is used to generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/ip6_fib.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 13690d650c3..286acfc2125 100644
--- a/net/ipv6/ip6_fib.c
+++ b/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