ethernet: neterion: vxge: vxge-traffic.c: fix for a potential NULL pointer dereference
Subsystems (3)
PATCH 1/1 ethernet: neterion: vxge: vxge-traffic.c: fix for a potential NULL pointer dereference
fix for a potential NULL pointer dereference and removal of a redundant assignment operation. Found using smatch.
--- drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/ethernet/neterion/vxge/vxge-traffic.c +2 -6
@@ -611,11 +611,8 @@ __vxge_hw_vpath_alarm_process(struct __vxge_hw_virtualpath *vpath,struct vxge_hw_vpath_stats_sw_info *sw_stats;struct vxge_hw_vpath_reg __iomem *vp_reg; -if (vpath =NULL ) { - alarm_event =VXGE_HW_SET_LEVEL (VXGE_HW_EVENT_UNKNOWN , - alarm_event); +if (vpath =NULL ) goto out2; - } hldev = vpath->hldev; vp_reg = vpath->vp_reg;
@@ -852,13 +849,12 @@ __vxge_hw_vpath_alarm_process(struct __vxge_hw_virtualpath *vpath, } out: hldev->stats.sw_dev_err_stats.vpath_alarms++; +__vxge_hw_device_handle_error (hldev, vpath->vp_id, alarm_event); out2:if ((alarm_event =VXGE_HW_EVENT_ALARM_CLEARED ) || (alarm_event =VXGE_HW_EVENT_UNKNOWN ))return VXGE_HW_OK ; -__vxge_hw_device_handle_error (hldev, vpath->vp_id, alarm_event); -if (alarm_event =VXGE_HW_EVENT_SERR )return VXGE_HW_ERR_CRITICAL ;
Signature · 1 line
1.7.9.5
Am 16.02.2013 18:56, schrieb Kumar Amit Mehta:
Quoted 30 lines
fix for a potential NULL pointer dereference and removal of a redundant assignment operation. Found using smatch.
Signed-off-by Kumar Amit Mehta <[email protected]>--- drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)drivers/net/ethernet/neterion/vxge/vxge-traffic.c +2
-4@@ -611,11 +611,8 @@ __vxge_hw_vpath_alarm_process(struct __vxge_hw_virtualpath *vpath,struct vxge_hw_vpath_stats_sw_info *sw_stats;struct vxge_hw_vpath_reg __iomem *vp_reg; -if (vpath =NULL ) { - alarm_event =VXGE_HW_SET_LEVEL (VXGE_HW_EVENT_UNKNOWN , - alarm_event); +if (vpath =NULL ) goto out2; - } hldev = vpath->hldev; vp_reg = vpath->vp_reg;@@ -852,13 +849,12 @@ __vxge_hw_vpath_alarm_process(struct __vxge_hw_virtualpath *vpath, } out: hldev->stats.sw_dev_err_stats.vpath_alarms++; +__vxge_hw_device_handle_error (hldev, vpath->vp_id, alarm_event);
drivers/net/ethernet/neterion/vxge/vxge-traffic.c __vxge_hw_vpath_alarm_process(struct __vxge_hw_virtualpath *vpath, · line 860
Quoted 10 lines
drivers/net/ethernet/neterion/vxge/vxge-traffic.c +0
-2out2:if ((alarm_event =VXGE_HW_EVENT_ALARM_CLEARED ) || (alarm_event =VXGE_HW_EVENT_UNKNOWN ))return VXGE_HW_OK ; -__vxge_hw_device_handle_error (hldev, vpath->vp_id, alarm_event); -if (alarm_event =VXGE_HW_EVENT_SERR )return VXGE_HW_ERR_CRITICAL ;
the patch looks ok.
it would be nice if someone would rewrite the if (alarm_event = x ) stuff using switch or more if()'s it is hardly readable this way.
just my 2 cents,
re,
wh
David Miller
maintainerFrom: Kumar Amit Mehta <[email protected]>
Date: Sat, 16 Feb 2013 09:56:34 -0800
Quoted 4 lines
fix for a potential NULL pointer dereference and removal of a redundant assignment operation. Found using smatch.
Signed-off-by Kumar Amit Mehta <[email protected]>
Obviously whoever wrote this code intended for ALARM_CLEARED and EVENT_UNKNOWN events to not be logged.
But you're changing that.
I'm not applying this patch, sorry.