From patchwork Sat Feb 16 17:56:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Amit Mehta X-Patchwork-Id: 221020 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7B1382C0085 for ; Sun, 17 Feb 2013 04:57:29 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753831Ab3BPR4v (ORCPT ); Sat, 16 Feb 2013 12:56:51 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:53257 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753514Ab3BPR4t (ORCPT ); Sat, 16 Feb 2013 12:56:49 -0500 Received: by mail-pa0-f54.google.com with SMTP id fa10so2142214pad.13 for ; Sat, 16 Feb 2013 09:56:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=Or6XqHIAlj0uwXJzKYiTKCmrR0shGRubIpOInLG3NBI=; b=O0kh5kqKklu0IUtnBgHwzCsYZV7KVQo0ZZtyia+iRfp7a4goIgZdklUr/f0ZWqdT/H zGozwAOfnDhpf0wh/TFUS21Cbelq+9F2bcaiJilfgNFvIHnJpg7+HyVimLLSVpKbFRQ8 Qu8Wm0me3spaTyG9GsLGZYoSj1eEQGzgswJ39Ol54GBlDzM8Cq/dcc4X/QnigTsUfvi+ 2nNeVmlJTomx7qcPioWoGT5a+ChN3tewk1oMS3tCnhCOcnkgG+Fq+ZSqP+ih11+seIOL dt+K3SrGdFjMNNOV68XD/8/8hZfsmXOSP61ZD3amnVEFJ9wI5mgBF16f6qKBFRlyfAr6 b46w== X-Received: by 10.68.134.130 with SMTP id pk2mr16224234pbb.20.1361037408752; Sat, 16 Feb 2013 09:56:48 -0800 (PST) Received: from localhost.localdomain ([117.202.97.37]) by mx.google.com with ESMTPS id w2sm92290499pax.22.2013.02.16.09.56.43 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 16 Feb 2013 09:56:48 -0800 (PST) From: Kumar Amit Mehta To: jdmason@kudzu.us Cc: davem@davemloft.net, joe@perches.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] ethernet: neterion: vxge: vxge-traffic.c: fix for a potential NULL pointer dereference Date: Sat, 16 Feb 2013 09:56:34 -0800 Message-Id: <1361037394-14731-1-git-send-email-gmate.amit@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org fix for a potential NULL pointer dereference and removal of a redundant assignment operation. Found using smatch. Signed-off-by: Kumar Amit Mehta --- drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c index 99749bd..adb05a8 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c @@ -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;