From patchwork Thu Sep 20 15:02:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selvin Xavier X-Patchwork-Id: 10607915 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 5FEC514DA for ; Thu, 20 Sep 2018 15:03:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50E5E29242 for ; Thu, 20 Sep 2018 15:03:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EB1129263; Thu, 20 Sep 2018 15:03:10 +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 E703429242 for ; Thu, 20 Sep 2018 15:03:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731305AbeITUrC (ORCPT ); Thu, 20 Sep 2018 16:47:02 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:45029 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730758AbeITUrB (ORCPT ); Thu, 20 Sep 2018 16:47:01 -0400 Received: by mail-pl1-f196.google.com with SMTP id ba4-v6so4475938plb.11 for ; Thu, 20 Sep 2018 08:03:08 -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=xolYOnnkUmGu8WpUGGN47W+wxGLhP0GlE44v2okXiIQ=; b=cTzVIjmwJ0ms2ghozP1isf1EtHO7/NvltGGML2VFUXqAJwez+vT/ZEwFjv2RVzkb6m Qgu2ntUN/hSI6kQtBgxkMw32pMrDqgrc4v4Ogene6uu7lkfpFSTbtJsQnKICRqUexxcP 4hs2xDBLjtdvtInFTmvNDeOReaRWQb3W6WYJQ= 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=xolYOnnkUmGu8WpUGGN47W+wxGLhP0GlE44v2okXiIQ=; b=k9jDDcc0cvIkpNpW8ThCSLP7SSXCmkTCCxQWF561ot065wmqKaepww/i4D4/KrR09A r9O9vrBvSWCiaWlxO41GHNUbXagMbs9JfrvYJJb+AS76A//nU+TZeL/nxa3mA8Fu098P qyBDwg9ArfM+miBNZaR6QEpbWnQs25UAy7MRgik9QZcTfWAEPI2hx61zYNzCFYsBt8hE JxWwgtiVW0EihM0MmCRthK9JJbK1w/ImY3oD14LJlCerRiKGixrm/CTT0EM+TGs62FlZ HKgZ4tdv5Mi6tZRLj+ZJp5nrLk5iCzFLZQUbaD78z2V6XHhsMgcXfOil9smu4we3Lnrj kCfg== X-Gm-Message-State: APzg51BCUmk2mTY0cydMh37bWO8nrPlvApLK1Vrl/3SyA4TG48x9C5KV TI6/Iv90hk8CA7LfzWpdhQLuaxLefRo= X-Google-Smtp-Source: ANB0VdZhh02MoefAn8GSe6IXEaXpcnNjXfDJ4XJXqjn+tUmbI2UiDUusjyWbGCiPxVlaaVKcu07E5Q== X-Received: by 2002:a17:902:a413:: with SMTP id p19-v6mr39791583plq.220.1537455787919; Thu, 20 Sep 2018 08:03:07 -0700 (PDT) Received: from dhcp-10-192-206-197.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 9-v6sm66271043pfc.20.2018.09.20.08.03.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Sep 2018 08:03:06 -0700 (PDT) From: Selvin Xavier To: linux-rdma@vger.kernel.org Cc: dledford@redhat.com, jgg@mellanox.com, Selvin Xavier Subject: [PATCH for-rc 1/4] RDMA/bnxt_re: Avoid null check after accessing the pointer Date: Thu, 20 Sep 2018 08:02:32 -0700 Message-Id: <1537455755-22808-2-git-send-email-selvin.xavier@broadcom.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1537455755-22808-1-git-send-email-selvin.xavier@broadcom.com> References: <1537455755-22808-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 --- 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 2852d35..eed9d56 100644 --- a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +++ b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c @@ -605,13 +605,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) @@ -620,6 +615,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; } @@ -705,6 +702,8 @@ int bnxt_qplib_enable_rcfw_channel(struct pci_dev *pdev, dev_err(&rcfw->pdev->dev, "QPLIB: CREQ BAR region %d mapping failed", rcfw->creq_bar_reg); + iounmap(rcfw->cmdq_bar_reg_iomem); + rcfw->cmdq_bar_reg_iomem = NULL; return -ENOMEM; } rcfw->creq_qp_event_processed = 0;