From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 396CBC32771 for ; Fri, 24 Jan 2020 11:25:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1036620704 for ; Fri, 24 Jan 2020 11:25:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865109; bh=IemQ7rz1e8vyxmLwQVB7T2/D7RFWmrBCVgX2UnWu0OY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HOBGNG9jzbOIdNkcuLtKfymUTrBWp3DP3x4IS33TwuTeKj2pkyTS0I5NtSswvGW+a GUztdfB953jawN9UJLdkNb9dvtyWBofklyQUDmeMsRiMoSiIuPjuBNlp6KTvhqA+bd 4IafiKSStHOSBfm9I1BtkFJ26Iv8Z57vTtMCVAPo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391455AbgAXLZH (ORCPT ); Fri, 24 Jan 2020 06:25:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:39014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391454AbgAXLZG (ORCPT ); Fri, 24 Jan 2020 06:25:06 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 886FF20704; Fri, 24 Jan 2020 11:25:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865106; bh=IemQ7rz1e8vyxmLwQVB7T2/D7RFWmrBCVgX2UnWu0OY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2ZrEqkZyXo+ny6fkdnCyTNKcrEuCj9ENqhtbUc9P7xYJQz6k0z97OYq5SGMNMZ6p1 jPlZRd/viSZATHBTq26GNJmDzNSlEgP0cpuP7khYxOc5fZyBBV+CR1htjaDySY0FlG KI9lHwF0LoOPOeqvPHM6asGCL5DYFo7F9Y9hhLM0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Somasundaram Krishnasamy , Michael Chan , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 455/639] bnxt_en: Fix ethtool selftest crash under error conditions. Date: Fri, 24 Jan 2020 10:30:25 +0100 Message-Id: <20200124093144.155714706@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michael Chan [ Upstream commit d27e2ca1166aefd54d9c48fb6647dee8115a5dfc ] After ethtool loopback packet tests, we re-open the nic for the next IRQ test. If the open fails, we must not proceed with the IRQ test or we will crash with NULL pointer dereference. Fix it by checking the bnxt_open_nic() return code before proceeding. Reported-by: Somasundaram Krishnasamy Fixes: 67fea463fd87 ("bnxt_en: Add interrupt test to ethtool -t selftest.") Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c index 0a409ba4012a3..dc63d269f01dc 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -2600,7 +2600,7 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, bool offline = false; u8 test_results = 0; u8 test_mask = 0; - int rc, i; + int rc = 0, i; if (!bp->num_tests || !BNXT_SINGLE_PF(bp)) return; @@ -2671,9 +2671,9 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, } bnxt_hwrm_phy_loopback(bp, false, false); bnxt_half_close_nic(bp); - bnxt_open_nic(bp, false, true); + rc = bnxt_open_nic(bp, false, true); } - if (bnxt_test_irq(bp)) { + if (rc || bnxt_test_irq(bp)) { buf[BNXT_IRQ_TEST_IDX] = 1; etest->flags |= ETH_TEST_FL_FAILED; } -- 2.20.1