commit 8910b49fbb8d4517a20bb3de7dc239dcfa7d2b6f
author Micah Gruber <micah.gruber@gmail.com> Mon Jul 09 11:29:04 2007 +0800
committer Jeff Garzik <jeff@garzik.org> Mon Jul 16 17:56:00 2007 -0400
tree c8ccd449c333a82cf8837df8275eec92d9986640
parent 4c75f7416f51b0c6855952467a5db04f9c598f09

Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c

This patch fixes a potential null dereference bug where we dereference
nic before a null check. This patch simply moves the dereferencing
after the null check.

Signed-off-by: Micah Gruber < micah.gruber@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

drivers/net/s2io.c

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index fa29a40..7d54935 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -796,12 +796,14 @@
 	struct mac_info *mac_control;
 	struct config_param *config;
 	int lst_size, lst_per_page;
-	struct net_device *dev = nic->dev;
+	struct net_device *dev;
 	int page_num = 0;
 
 	if (!nic)
 		return;
 
+	dev = nic->dev;
+
 	mac_control = &nic->mac_control;
 	config = &nic->config;