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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 3939FC2BBCD for ; Wed, 17 Mar 2021 01:00:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0EA7D64FD1 for ; Wed, 17 Mar 2021 01:00:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230108AbhCQBAH (ORCPT ); Tue, 16 Mar 2021 21:00:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:36062 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232004AbhCQA6V (ORCPT ); Tue, 16 Mar 2021 20:58:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1A6B864F9E; Wed, 17 Mar 2021 00:58:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615942694; bh=Z5IE1ta42oWIMZ3rFCd+yaK9i+JloaJtApauh/WGyhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jL5mCIYWlAagods0p7jYnTqTo5KOZR65hJkl2k8/BqV7DI+WJob0zCTpLastUGTbU GgVq3cCeLm7i+1Raf/DtUWcvCroLOWbuFtPROGVi3oKyy5dlNEubGxo0xTipwGeD5J WMJt3D131JUBCz6ELv1y7xXE5rpamp+O8UhzNel0hbSQrD/dLtZFs+ZTSRRdGgLdIP DWgCcSzYgn/cm1HgMJU9mOEu3bY6JconkHpUWFqUV2RsyQFSA0p2jre0X7Butivmwf US8RGKHM4YG07K8tuZdY1VoNCXSTtfeqVocIh083t1Ba4PuryCBb4O5ypyK7sDPHiY ynPRBx6EyTzwA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jia-Ju Bai , TOTE Robot , "David S . Miller" , Sasha Levin , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 09/37] net: intel: iavf: fix error return code of iavf_init_get_resources() Date: Tue, 16 Mar 2021 20:57:34 -0400 Message-Id: <20210317005802.725825-9-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210317005802.725825-1-sashal@kernel.org> References: <20210317005802.725825-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jia-Ju Bai [ Upstream commit 6650d31f21b8a0043613ae0a4a2e42e49dc20b2d ] When iavf_process_config() fails, no error return code of iavf_init_get_resources() is assigned. To fix this bug, err is assigned with the return value of iavf_process_config(), and then err is checked. Reported-by: TOTE Robot Signed-off-by: Jia-Ju Bai Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/iavf/iavf_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index 56e6bec9af79..cffc8c1044f2 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -1786,7 +1786,8 @@ static int iavf_init_get_resources(struct iavf_adapter *adapter) goto err_alloc; } - if (iavf_process_config(adapter)) + err = iavf_process_config(adapter); + if (err) goto err_alloc; adapter->current_op = VIRTCHNL_OP_UNKNOWN; -- 2.30.1