summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2009-04-23 15:31:38 +0000
committerDavid S. Miller <davem@davemloft.net>2009-04-27 03:02:46 -0700
commit4e204c1000561ddb1a62a9df857cb0457dd868a7 (patch)
tree77bd131db970bd2f3b0cf985978dabd2c961d15c
parent41f8910040639eb106b1a5b5301aab79ecde4940 (diff)
downloadlinux-stable-4e204c1000561ddb1a62a9df857cb0457dd868a7.tar.gz
linux-stable-4e204c1000561ddb1a62a9df857cb0457dd868a7.tar.bz2
linux-stable-4e204c1000561ddb1a62a9df857cb0457dd868a7.zip
vxge: fix possible NULL dereference in vxge-traffic.c
If vpath is NULL then hldev is NULL also. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Acked-by: Ram Vepa <ram.vepa@neterion.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/vxge/vxge-traffic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c
index 7be0ae10d69b..506625b180ac 100644
--- a/drivers/net/vxge/vxge-traffic.c
+++ b/drivers/net/vxge/vxge-traffic.c
@@ -1923,7 +1923,7 @@ enum vxge_hw_status __vxge_hw_vpath_alarm_process(
if (vpath == NULL) {
alarm_event = VXGE_HW_SET_LEVEL(VXGE_HW_EVENT_UNKNOWN,
alarm_event);
- goto out;
+ goto out2;
}
hldev = vpath->hldev;
@@ -2161,7 +2161,7 @@ enum vxge_hw_status __vxge_hw_vpath_alarm_process(
}
out:
hldev->stats.sw_dev_err_stats.vpath_alarms++;
-
+out2:
if ((alarm_event == VXGE_HW_EVENT_ALARM_CLEARED) ||
(alarm_event == VXGE_HW_EVENT_UNKNOWN))
return VXGE_HW_OK;