Commit c3f6c21d authored Jan 10, 2010 by Jiri Slaby Committed by David S. Miller Jan 10, 2010

NET: ipv6, remove unnecessary check

Stanse found a potential null dereference in snmp6_unregister_dev.
There is a check for idev being NULL, but it is dereferenced
earlier. But idev cannot be NULL when passed to
snmp6_unregister_dev, so remove the test.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: "Pekka Savola (ipv6)" <pekkas@netcore.fi>
Cc: James Morris <jmorris@namei.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 51f53006

net/ipv6/proc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ int snmp6_unregister_dev(struct inet6_dev *idev)
		struct net *net = dev_net(idev->dev);
		if (!net->mib.proc_net_devsnmp6)
		return -ENOENT;
		if (!idev \|\| !idev->stats.proc_dir_entry)
		if (!idev->stats.proc_dir_entry)
		return -EINVAL;
		remove_proc_entry(idev->stats.proc_dir_entry->name,
		net->mib.proc_net_devsnmp6);

Admin message