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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB562C4167B for ; Mon, 6 Nov 2023 13:22:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232440AbjKFNWf (ORCPT ); Mon, 6 Nov 2023 08:22:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232400AbjKFNWf (ORCPT ); Mon, 6 Nov 2023 08:22:35 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A17DF94 for ; Mon, 6 Nov 2023 05:22:32 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6B69C433C8; Mon, 6 Nov 2023 13:22:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1699276952; bh=km4eaG7zydQVS1smH8RZWpclWwWWc4yJ/tv62gJUSxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IO+/TvVd1DL0OzA0nZIIAcUVvDfddzXVWTWBAMLt0G1gSihWpr+MzWIx9amSjOp/3 OhOjpJkwrqy3+69HmbGhsNFtZJzu3jhTo7ZmYgv5GN7r3nSzAtAiZ7r/38vEd4GE0W Z39/O+Mpp+H8orH1iyhrW01TP7F50N2g5w1H/dRY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Su Hui , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 63/74] net: chelsio: cxgb4: add an error code check in t4_load_phy_fw Date: Mon, 6 Nov 2023 14:04:23 +0100 Message-ID: <20231106130303.868158229@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231106130301.687882731@linuxfoundation.org> References: <20231106130301.687882731@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Su Hui [ Upstream commit 9f771493da935299c6393ad3563b581255d01a37 ] t4_set_params_timeout() can return -EINVAL if failed, add check for this. Signed-off-by: Su Hui Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c index 42374859b9d35..cb3f515559c27 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c @@ -3850,6 +3850,8 @@ int t4_load_phy_fw(struct adapter *adap, FW_PARAMS_PARAM_Z_V(FW_PARAMS_PARAM_DEV_PHYFW_DOWNLOAD)); ret = t4_set_params_timeout(adap, adap->mbox, adap->pf, 0, 1, ¶m, &val, 30000); + if (ret) + return ret; /* If we have version number support, then check to see that the new * firmware got loaded properly. -- 2.42.0