From patchwork Mon Oct 8 10:27:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selvin Xavier X-Patchwork-Id: 10630353 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CDFA0112B for ; Mon, 8 Oct 2018 10:28:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3214F288B5 for ; Mon, 8 Oct 2018 10:28:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26A46288CA; Mon, 8 Oct 2018 10:28:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C72AE288B5 for ; Mon, 8 Oct 2018 10:28:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726689AbeJHRjp (ORCPT ); Mon, 8 Oct 2018 13:39:45 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:41220 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726330AbeJHRjo (ORCPT ); Mon, 8 Oct 2018 13:39:44 -0400 Received: by mail-wr1-f67.google.com with SMTP id x12-v6so20200261wru.8 for ; Mon, 08 Oct 2018 03:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dKocEgNkwpOJDRbXEmZyEErHu3Ks0EpHqUITZRPeASg=; b=FDZi9YhbtMpGO6pwDi/BxUArf3tou5b96iEBvlh9hCc5tlG8Ds5FDdqLcD3O+FKhp2 Wqwxp8dRwOfuQcCdPE8R9yd49+rsVe9qxc7Z7mepejxsfylAwswH01CvqMsRkdHScZ/a pdkWvxfPqyAY51tzRKT/tZWx7PpqvrP10t510= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dKocEgNkwpOJDRbXEmZyEErHu3Ks0EpHqUITZRPeASg=; b=HuWWsxFgqqUFWm2jC5kKlUxMP+Qw/4+qRlPzsd5Cp004VkyteZGcXq0thl+wfcj6Ur ftbo//Oi5E+5BdNU/xggYOqwHICaqqD2jiSYOVAA26FaHSibwd7chdySWZMJeK56RfOp sv7vQ1rWifGieOYMq14Ajz4OSHAaBjAVgWZjZJqxAyGJEWDwSdjaCcCRFDD1Lw5qZ5Ov G2mG3sRvwksTeruqOeRwbY+7LmNvTJ3oUc2o/EUu5Q2fv3RceJDGl+I5K61CEWMAaNte pxoxHjpDZDAsGiCoXxyMfBCakJ/pQ9WzDZdaRN3ZoQLkdiQw0nrJWNnfpNklhewyVF8x yf2w== X-Gm-Message-State: ABuFfohc49/J8SG3GpyX1U0rW8uvk2GSXI63Owp19i0FuQWoL/YmUtGr bwKeitZirpx1qgjqsHFZalPo4w== X-Google-Smtp-Source: ACcGV63TyxWzaJs72WR7dZogmS8hhBW804YJnVSIJT9Ar3Dca/VqZXro48dqWAYvg6ffCcEsTkuoNA== X-Received: by 2002:adf:8382:: with SMTP id 2-v6mr15611828wre.13.1538994522102; Mon, 08 Oct 2018 03:28:42 -0700 (PDT) Received: from dhcp-10-192-206-197.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 143-v6sm12674897wmv.6.2018.10.08.03.28.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 03:28:41 -0700 (PDT) From: Selvin Xavier To: dledford@redhat.com, jgg@mellanox.com Cc: linux-rdma@vger.kernel.org, Selvin Xavier , dan.carpenter@oracle.com Subject: [PATCH rdma-next 04/13] RDMA/bnxt_re: Avoid null check after accessing the pointer Date: Mon, 8 Oct 2018 03:27:55 -0700 Message-Id: <1538994484-21390-5-git-send-email-selvin.xavier@broadcom.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1538994484-21390-1-git-send-email-selvin.xavier@broadcom.com> References: <1538994484-21390-1-git-send-email-selvin.xavier@broadcom.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is reported by smatch check. rcfw->creq_bar_reg_iomem is accessed in bnxt_qplib_rcfw_stop_irq and this variable check afterwards doesn't make sense. Also, rcfw->creq_bar_reg_iomem will never be NULL. So Removing this check. Reported-by: Dan Carpenter Fixes: 6e04b1035689 ("RDMA/bnxt_re: Fix broken RoCE driver due to recent L2 driver changes") Signed-off-by: Selvin Xavier Cc: dan.carpenter@oracle.com --- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c index 0c6a3ac..5d1504e 100644 --- a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +++ b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c @@ -615,13 +615,8 @@ void bnxt_qplib_disable_rcfw_channel(struct bnxt_qplib_rcfw *rcfw) bnxt_qplib_rcfw_stop_irq(rcfw, true); - if (rcfw->cmdq_bar_reg_iomem) - iounmap(rcfw->cmdq_bar_reg_iomem); - rcfw->cmdq_bar_reg_iomem = NULL; - - if (rcfw->creq_bar_reg_iomem) - iounmap(rcfw->creq_bar_reg_iomem); - rcfw->creq_bar_reg_iomem = NULL; + iounmap(rcfw->cmdq_bar_reg_iomem); + iounmap(rcfw->creq_bar_reg_iomem); indx = find_first_bit(rcfw->cmdq_bitmap, rcfw->bmap_size); if (indx != rcfw->bmap_size) @@ -630,6 +625,8 @@ void bnxt_qplib_disable_rcfw_channel(struct bnxt_qplib_rcfw *rcfw) kfree(rcfw->cmdq_bitmap); rcfw->bmap_size = 0; + rcfw->cmdq_bar_reg_iomem = NULL; + rcfw->creq_bar_reg_iomem = NULL; rcfw->aeq_handler = NULL; rcfw->vector = 0; } @@ -713,6 +710,8 @@ int bnxt_qplib_enable_rcfw_channel(struct pci_dev *pdev, if (!rcfw->creq_bar_reg_iomem) { dev_err(&rcfw->pdev->dev, "CREQ BAR region %d mapping failed\n", rcfw->creq_bar_reg); + iounmap(rcfw->cmdq_bar_reg_iomem); + rcfw->cmdq_bar_reg_iomem = NULL; return -ENOMEM; } rcfw->creq_qp_event_processed = 0;