Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp3203615iob; Fri, 6 May 2022 22:27:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2uVyimJ5f6+DBkxtd37nbHekhYz3me9q7YvwSXAp0aiHceE4xz5zkKxr5I/yMIh1z28B2 X-Received: by 2002:a9d:6956:0:b0:605:fcae:3240 with SMTP id p22-20020a9d6956000000b00605fcae3240mr2209709oto.280.1651901243855; Fri, 06 May 2022 22:27:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651901243; cv=none; d=google.com; s=arc-20160816; b=Fq8FizPOrKBO0yLNwIc9wj9TGBWVrgXdnkJOcSZVviFWh03LLUiBkQu3t5EaSXB4Vm 8ilYNGoS99PezcNEvpcz3LyuKORPq75BpUacZceG5T5ZVcZX8cs5b9c7uNcTlFLPgvzE pCgqwOpd/sX3+AIIr0ZFt0oLX4wwWAzewV2xSSSzR5I4adM6QqECIzi+G3GnEgZ8kP81 cg959IePRPNdbNp6Eswr98zQoT+43U3UOuSJaBx0f8oxsbBXalak3jKH2jqrN1gk44yy Fof8NYqjR0vn/CTgYie/jwUT0St2LFf2RIKKJNuY+LH+6Hzvmha+H1qQcGiaoDyzgGgR YEMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=B8Ffv/7OenIvhlmZ5Y2RtAICOjEESSQe6twzX579gm8=; b=xUL7Bmz+/vitKE0k1dNyv/DaTtIBvnZ9I/hLT29sP2uO3Z2ldMlF5Dos1CVkM1Met7 v+twiGf9biWRQS3V3HjrxmT1DWEjvJlOUMbvseCvEUGzkw1CHGVtSmAcXc9G4ozhCYfm TTHruafJpwjjnjyJTLAUYe7/pEJp3U3cilfPl9c7iajGVHQs5juhzEob7ZgraPK7TuZP 7Np5h0wHpK2VgLQnasavns2zGVOIGnr1Q30Vq3fJRuWQP4Oe4NEH96/7FfXtOreNL/0G 6jtinO130F0ze/ubJYdu34cyf9Z4hG9eE273boqSEMWOOjxBA9YkAJh0FmyYN/2T0rcS DP1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KWsTZRF8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y127-20020aca4b85000000b00326257889dbsi4779994oia.82.2022.05.06.22.27.10; Fri, 06 May 2022 22:27:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KWsTZRF8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358523AbiEDRl3 (ORCPT + 99 others); Wed, 4 May 2022 13:41:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357353AbiEDRKJ (ORCPT ); Wed, 4 May 2022 13:10:09 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B463B4AE0F; Wed, 4 May 2022 09:57:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2AE8DB827A4; Wed, 4 May 2022 16:57:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFCC6C385AA; Wed, 4 May 2022 16:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683436; bh=lhzlZLPEEXYW9Hm9o6P8qfPtCrZcAtQtbZGZWklwKYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KWsTZRF8x8SQYFbTUFbtgLNEcPqB68mQoHTlyEhCFEwYtUGDn+T6q+cmWQSfqxlYa gwE+VROTVvmfUn0cX8xxuuJGc/OgKS8BUjGT4qBj5GqGvnPdfByKeLGWai9N7usHFB 3isBLXN1+8/FyzezRwj9/VacC9iQqvyypscyv5K4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jie Wang , Guangbin Huang , "David S. Miller" , Sasha Levin Subject: [PATCH 5.17 116/225] net: hns3: modify the return code of hclge_get_ring_chain_from_mbx Date: Wed, 4 May 2022 18:45:54 +0200 Message-Id: <20220504153120.895110552@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jie Wang [ Upstream commit 48009e9972974c52a5f649f761862dd67bce3d13 ] Currently, function hclge_get_ring_chain_from_mbx will return -ENOMEM if ring_num is bigger than HCLGE_MBX_MAX_RING_CHAIN_PARAM_NUM. It is better to return -EINVAL for the invalid parameter case. So this patch fixes it by return -EINVAL in this abnormal branch. Fixes: 5d02a58dae60 ("net: hns3: fix for buffer overflow smatch warning") Signed-off-by: Jie Wang Signed-off-by: Guangbin Huang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c index 6799d16de34b..36cbafc5f944 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c @@ -176,7 +176,7 @@ static int hclge_get_ring_chain_from_mbx( ring_num = req->msg.ring_num; if (ring_num > HCLGE_MBX_MAX_RING_CHAIN_PARAM_NUM) - return -ENOMEM; + return -EINVAL; for (i = 0; i < ring_num; i++) { if (req->msg.param[i].tqp_index >= vport->nic.kinfo.rss_size) { -- 2.35.1