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=unavailable 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 E3AD7C35242 for ; Fri, 24 Jan 2020 10:00:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0CDA206D5 for ; Fri, 24 Jan 2020 10:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860049; bh=nPDfvmTBMEFTTWIr/Pj/1sN/RS82nFMkU0vuHnzTFpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=e6YkL/g+e6feXySfsbUm9XZ1JbWWn200J3vicvqG9O7YccQ2Mg9QVQPd4TwgkPvOj 5xUkHHlY0t8MgjZszbqkzMeYjXdPD7JHNiqOWHN73kU69qJijB0sX6PmezlrfR+ENB LTesWPYRTYeKdNpcHnQIIqX8XiftXovk2PW6xYBY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388803AbgAXKAt (ORCPT ); Fri, 24 Jan 2020 05:00:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:36226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387604AbgAXKAr (ORCPT ); Fri, 24 Jan 2020 05:00:47 -0500 Received: from localhost (unknown [145.15.244.15]) (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 C07C320709; Fri, 24 Jan 2020 10:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860047; bh=nPDfvmTBMEFTTWIr/Pj/1sN/RS82nFMkU0vuHnzTFpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xQt0Mm5TjMHCQFvcmQQVaFtLnDMUQZQisPUdiBZodtEZ/49XSYZgG0zxqsB4NQPQZ aSCc0JOPwJ5q6hZniVOGuXfYwvdeCcm6B0w6pcCi8Y3qrLBhsCTINbRIxI5n+TEXqt M50twuUk/AgQBGoOJE4HSBcx0DELzZylWN3yJ8rQ= 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.14 247/343] bnxt_en: Fix ethtool selftest crash under error conditions. Date: Fri, 24 Jan 2020 10:31:05 +0100 Message-Id: <20200124092952.575980582@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 fc8e185718a1d..963beaa8fabbc 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -2463,7 +2463,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; @@ -2521,9 +2521,9 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, } bnxt_hwrm_phy_loopback(bp, 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