From patchwork Fri Apr 24 01:31:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26395 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4857DB6F44 for ; Fri, 24 Apr 2009 11:32:01 +1000 (EST) Received: by ozlabs.org (Postfix) id 38E65DE0E9; Fri, 24 Apr 2009 11:32:01 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id D1CF4DE0E3 for ; Fri, 24 Apr 2009 11:32:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752492AbZDXBbo (ORCPT ); Thu, 23 Apr 2009 21:31:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752312AbZDXBbn (ORCPT ); Thu, 23 Apr 2009 21:31:43 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:40434 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752088AbZDXBbn (ORCPT ); Thu, 23 Apr 2009 21:31:43 -0400 Received: by fxm2 with SMTP id 2so862653fxm.37 for ; Thu, 23 Apr 2009 18:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=v32Dnx/tZErxHplTltpINDtyPbJ3CGBixZVrhdgywQg=; b=YCzK5DYQT3VZ+xV6D1zAVv714TNGOfwAT4tyjn7RcsvyrSW3TW3WFM5nFbEdO3aGug fgVrPtjE9q8XR/GUv8lZmRJGcsEAli1swEnG/NLq3rbk386Rl5/YVrD1ii7WYNZVEYgH yfD+nqOGhz/HUXs62+5GJhEc+qqogTBBCmiNs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=eMp2tloiiksLyyfcdYiJNH6CJEhyeyoo8Z4dInoN7UAGagXj0ghgaEPgJqdPfgAoi4 4NpzqxzecqIeSoORUM0TR5lx6Uiq9M/8jfYU2MaVYJIjx3hQdzcYlBxwxAG6F8hag7N0 w8gzYRSKCtge+GPW/0mbbFAy1vY2LrejGMvkc= Received: by 10.103.218.9 with SMTP id v9mr956485muq.78.1240536701441; Thu, 23 Apr 2009 18:31:41 -0700 (PDT) Received: from localhost.localdomain (ppp91-76-228-193.pppoe.mtu-net.ru [91.76.228.193]) by mx.google.com with ESMTPS id 12sm1622593muq.51.2009.04.23.18.31.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 23 Apr 2009 18:31:40 -0700 (PDT) From: Alexander Beregalov To: ram.vepa@neterion.com, netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH] vxge: fix possible NULL dereference in vxge-traffic.c Date: Fri, 24 Apr 2009 05:31:38 +0400 Message-Id: <1240536698-10821-1-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If vpath is NULL then hldev is NULL also. Signed-off-by: Alexander Beregalov Acked-by: Ram Vepa --- drivers/net/vxge/vxge-traffic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c index 7be0ae1..506625b 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;