summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Wei <lw@cn.fujitsu.com>2012-03-07 14:58:07 +0000
committerDavid S. Miller <davem@davemloft.net>2012-03-11 15:57:11 -0700
commit8b2aaedee4eaa94e816144ed54b9707b96be29f8 (patch)
tree0fd46f2b7fdfd5aacda2c35470048dfe2fb00dab
parent7fbc415d7bd0ff0224eea53c678fa9f13f646b4f (diff)
downloadop-kernel-dev-8b2aaedee4eaa94e816144ed54b9707b96be29f8.zip
op-kernel-dev-8b2aaedee4eaa94e816144ed54b9707b96be29f8.tar.gz
ipv6: Fix Smatch warning.
With commit d6ddef9e641d(IPv6: Fix not join all-router mcast group when forwarding set.) I check 'dev' after it's dereference that leads to a Smatch complaint: net/ipv6/addrconf.c:438 ipv6_add_dev() warn: variable dereferenced before check 'dev' (see line 432) net/ipv6/addrconf.c 431 /* protected by rtnl_lock */ 432 rcu_assign_pointer(dev->ip6_ptr, ndev); ^^^^^^^^^^^^ Old dereference. 433 434 /* Join all-node multicast group */ 435 ipv6_dev_mc_inc(dev, &in6addr_linklocal_allnodes); 436 437 /* Join all-router multicast group if forwarding is set */ 438 if (ndev->cnf.forwarding && dev && (dev->flags & IFF_MULTICAST)) ^^^ Remove the check to avoid the complaint as 'dev' can't be NULL. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Li Wei <lw@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/addrconf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 6b8ebc5..6a3bb60 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -435,7 +435,7 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
ipv6_dev_mc_inc(dev, &in6addr_linklocal_allnodes);
/* Join all-router multicast group if forwarding is set */
- if (ndev->cnf.forwarding && dev && (dev->flags & IFF_MULTICAST))
+ if (ndev->cnf.forwarding && (dev->flags & IFF_MULTICAST))
ipv6_dev_mc_inc(dev, &in6addr_linklocal_allrouters);
return ndev;
OpenPOWER on IntegriCloud