From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756869AbcHWGQg (ORCPT ); Tue, 23 Aug 2016 02:16:36 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:58856 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752299AbcHWGQe (ORCPT ); Tue, 23 Aug 2016 02:16:34 -0400 X-AuditID: cbfec7f4-f796c6d000001486-50-57bbea3eca66 From: Andrzej Hajda To: Hariprasad S , netdev@vger.kernel.org (open list:CXGB4 ETHERNET DRIVER (CXGB4)) Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] cxgb4: fix invalid checks in alloc_uld_rxqs Date: Tue, 23 Aug 2016 08:16:19 +0200 Message-id: <1471932979-17864-1-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLJMWRmVeSWpSXmKPExsVy+t/xK7p2r3aHG8z8YmJxa905VouNM9az Wjx7e5vF4vKuOWwWa4/cZbc4tkDMgc3j6Y45rB59W1YxenzeJBfAHMVlk5Kak1mWWqRvl8CV se3OT8aCl/wVk+ZfZ21gvMXTxcjJISFgItH8upUNwhaTuHBvPZDNxSEksJRRYsHWfhYIp4lJ Ytet1+wgVWwCmhJ/N98E6xARyJX4824dWAezwC5GiT831zKDJIQFbCT2nmlhBbFZBFQlPi2e D2bzCjhLXD9zgxFinZzEyWOTWScwci9gZFjFKJpamlxQnJSea6hXnJhbXJqXrpecn7uJERII X3YwLj5mdYhRgINRiYd3B/vucCHWxLLiytxDjBIczEoivKefAIV4UxIrq1KL8uOLSnNSiw8x SnOwKInzzt31PkRIID2xJDU7NbUgtQgmy8TBKdXAqCaceXL9fskg+9OpN7JKhPWDzxq9v+y6 xC0tvsW0i1fH/N8tcW17j/U7P3xuDY5jZ1jz9LuG3W+vX/HWDD8fno7uXLmj7ti7c+sfLFkq XdFYx9kw7y47J9fZe7aX92zMWL3vvN9VxlTuE84+CUryt98vEdLSnxWz6oKEih/TZ7M61XLu xvIpSizFGYmGWsxFxYkAM/wAKQACAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Local variable msi_idx defined as unsigned int is always >= 0, thus both 'if' checks are always true. On the other side presence of USING_MSIX flag suggests the checks should not be trivially true. The simplest solution is to replace incorrect checks with direct testing of adap->flags and remove spare variables. The problem has been detected using semantic patch scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci Signed-off-by: Andrzej Hajda --- Hi, I am not familiar with the code, and it is not clear to me, so my solution can be incorrect, anyway there is an issue here. Regards Andrzej --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c index aac6e44..1e0c952 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c @@ -121,20 +121,14 @@ static int alloc_uld_rxqs(struct adapter *adap, struct sge_uld_rxq_info *rxq_info, unsigned int nq, unsigned int offset, bool lro) { - struct sge *s = &adap->sge; struct sge_ofld_rxq *q = rxq_info->uldrxq + offset; unsigned short *ids = rxq_info->rspq_id + offset; unsigned int per_chan = nq / adap->params.nports; - unsigned int msi_idx, bmap_idx; + unsigned int bmap_idx; int i, err; - if (adap->flags & USING_MSIX) - msi_idx = 1; - else - msi_idx = -((int)s->intrq.abs_id + 1); - for (i = 0; i < nq; i++, q++) { - if (msi_idx >= 0) { + if (adap->flags & USING_MSIX) { bmap_idx = get_msix_idx_from_bmap(adap); adap->msi_idx++; } @@ -147,7 +141,7 @@ static int alloc_uld_rxqs(struct adapter *adap, 0); if (err) goto freeout; - if (msi_idx >= 0) + if (adap->flags & USING_MSIX) rxq_info->msix_tbl[i + offset] = bmap_idx; memset(&q->stats, 0, sizeof(q->stats)); if (ids) -- 1.9.1