summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Gruber <micah.gruber@gmail.com>2007-07-09 11:29:04 +0800
committerJeff Garzik <jeff@garzik.org>2007-07-16 17:56:00 -0400
commit8910b49fbb8d4517a20bb3de7dc239dcfa7d2b6f (patch)
treec8ccd449c333a82cf8837df8275eec92d9986640
parent4c75f7416f51b0c6855952467a5db04f9c598f09 (diff)
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>
-rw-r--r--drivers/net/s2io.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index fa29a403a247..7d549355815a 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -796,12 +796,14 @@ static void free_shared_mem(struct s2io_nic *nic)
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;