From patchwork Tue Aug 26 07:24:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Mintz X-Patchwork-Id: 382996 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 854A91400D7 for ; Tue, 26 Aug 2014 17:25:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757417AbaHZHZT (ORCPT ); Tue, 26 Aug 2014 03:25:19 -0400 Received: from mx0a-0016ce01.pphosted.com ([67.231.148.157]:5536 "EHLO mx0a-0016ce01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755391AbaHZHZS (ORCPT ); Tue, 26 Aug 2014 03:25:18 -0400 Received: from pps.filterd (m0045602.ppops.net [127.0.0.1]) by mx0a-0016ce01.pphosted.com (8.14.5/8.14.5) with SMTP id s7Q7Ip1K021099; Tue, 26 Aug 2014 00:25:16 -0700 Received: from avcashub1.qlogic.com (avcashub2.qlogic.com [198.70.193.116]) by mx0a-0016ce01.pphosted.com with ESMTP id 1nxm4pvs0r-1 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Tue, 26 Aug 2014 00:25:16 -0700 Received: from localhost.qlogic.org (10.185.6.94) by qlc.com (10.1.4.191) with Microsoft SMTP Server id 14.2.347.0; Tue, 26 Aug 2014 00:25:15 -0700 From: Yuval Mintz To: CC: , , , , Yuval Mintz Subject: [PATCH net-next] bnx2x: Fix static checker warning regarding `txdata_ptr' Date: Tue, 26 Aug 2014 10:24:41 +0300 Message-ID: <1409037881-4192-1-git-send-email-Yuval.Mintz@qlogic.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 disclaimer: bypass X-Proofpoint-Virus-Version: vendor=nai engine=5600 definitions=7541 signatures=670506 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=1 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1408260094 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Incorrect checking of array instead of array contents in panic_dump flow - results of commit e261199872a2 ("bnx2x: Safe bnx2x_panic_dump()"). Reported-by: Dan Carpenter Signed-off-by: Yuval Mintz --- Hi Dave, Please apply this to `net-next'. Thanks, Yuval Mintz --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 2f394b8..93132d8f 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -985,7 +985,7 @@ void bnx2x_panic_dump(struct bnx2x *bp, bool disable_int) /* Tx */ for_each_cos_in_tx_queue(fp, cos) { - if (!fp->txdata_ptr) + if (!fp->txdata_ptr[cos]) break; txdata = *fp->txdata_ptr[cos]; @@ -1140,7 +1140,7 @@ void bnx2x_panic_dump(struct bnx2x *bp, bool disable_int) for_each_cos_in_tx_queue(fp, cos) { struct bnx2x_fp_txdata *txdata = fp->txdata_ptr[cos]; - if (!fp->txdata_ptr) + if (!fp->txdata_ptr[cos]) break; if (!txdata->tx_cons_sb)