Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp436902iob; Wed, 18 May 2022 05:35:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynD5SkndVe8LmqXf0kMQhmmTiGvHfrUBpc96Pi/VLpSG2yd4E5jZpusLugSZhwlGzkD7H3 X-Received: by 2002:a17:90b:4acf:b0:1dc:e6f2:dda1 with SMTP id mh15-20020a17090b4acf00b001dce6f2dda1mr29928627pjb.114.1652877330832; Wed, 18 May 2022 05:35:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652877330; cv=none; d=google.com; s=arc-20160816; b=dhEKJngD2cya4wE6hMN23NgVgjQysLNArUFiWQaNwUzo0dcX/eTTCzD+MGzMsURDGP wxlShVXJqueGlCyXhZtHNEEVv3x3bFYNxPwbS2MRaA/dGRCsfjtiG17IPeiWn5p0WJSH d9C0JXPAYZ/0HoA7yz2cei7IdrSyTn+fW5d3wg6sJ8SX9LMFGCSFSrOlfwQlg25mmaQ4 Q8dZfp9RWJDw79tScBZvnhpq5b5r335EkMWrkngstXHi4nKa1NGzW3f8TN99j+cZADbf lRJhovH64a0HpgkkmuLXKRxnKfyiyfe7hOKUgXN5SCRfmqhVUFHaFhbR+m5xA1Ws880B wA7Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NcY4lMJAD/IJUl0818N13Brj8NzsUc892qFgs7msEFM=; b=MhxeD9eLGLFnDa/38BdKB5k/2QxgHwHpBOeGB0NtlYTT2Mjn+bvZK2bXCJDfUHOARj Mc3T/xF4390KLsY1A2JOSvxSS7VkffQGUXNN9jnAzvhs9gWdBDZ7lh1ksT8S7fgIFH0G eKAw2IJxkBM3uY5ImSZK+ehFGvEUGAKxO0lVw1ToZcJogyGF8rmEnFUXbDHyex5zIfeH pWCV4qDqeJQhXZ5evOoX8wi3LHk7g7dR88p0XtVqO97LgZwE7YwQlBOYOAHGf2Nhpst7 lSMu7Fa625uwEZAEQe6Hki1XUQgb6hxcuTTJXrpF9XL1tn+tx/iJwpTm6K/xzDqRB3G6 lPVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sej3273q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id v13-20020a17090abb8d00b001df7b18e706si2516029pjr.168.2022.05.18.05.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 05:35:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sej3273q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9247015D322; Wed, 18 May 2022 05:31:45 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236803AbiERM2v (ORCPT + 99 others); Wed, 18 May 2022 08:28:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236701AbiERM2K (ORCPT ); Wed, 18 May 2022 08:28:10 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4533E14CA3D; Wed, 18 May 2022 05:27:45 -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 68B17B81FB7; Wed, 18 May 2022 12:27:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9F61C385AA; Wed, 18 May 2022 12:27:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652876862; bh=v50uETX7g7YMrbL1KvaOCnvkl++jQQhG0ddga8Pvxtk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sej3273q3Pqb4byT4jRiYe7Iwo6FuOWmcxfdKqbaAAT6ABNoVemo3Otae/sUleFqk MKfXPvMT/DEtYuIf1/AEgQpXcvSwJ+ryM/ix7+zBhEkMdid6F1G8a8hhw5n/dQ6EBB fRBVbFnzcDyPw4qCN9b0oeRcZw20vAA8Ejcid7l0BaQrHN5H8Dh5YyTbhXfZ6D35Uf jc+wxEMBSEcvvuEkSixxHQIPbIvxko6yB6MQiCiddbv5u18CtNSaI8fJvO0TCVf+e9 2w6o08zGA3NoNgsDRooD6BxgIxl/qd2xfnDtlbgXs93iKSe1YNgmOMPD00BGAh+j6V ameZfU4VKtODA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Grant Grundler , Aashay Shringarpure , Yi Chou , Shervin Oloumi , "David S . Miller" , Sasha Levin , irusskikh@marvell.com, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 21/23] net: atlantic: verify hw_head_ lies within TX buffer ring Date: Wed, 18 May 2022 08:26:34 -0400 Message-Id: <20220518122641.342120-21-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220518122641.342120-1-sashal@kernel.org> References: <20220518122641.342120-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: Grant Grundler [ Upstream commit 2120b7f4d128433ad8c5f503a9584deba0684901 ] Bounds check hw_head index provided by NIC to verify it lies within the TX buffer ring. Reported-by: Aashay Shringarpure Reported-by: Yi Chou Reported-by: Shervin Oloumi Signed-off-by: Grant Grundler Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c index d875ce3ec759..15ede7285fb5 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c @@ -889,6 +889,13 @@ int hw_atl_b0_hw_ring_tx_head_update(struct aq_hw_s *self, err = -ENXIO; goto err_exit; } + + /* Validate that the new hw_head_ is reasonable. */ + if (hw_head_ >= ring->size) { + err = -ENXIO; + goto err_exit; + } + ring->hw_head = hw_head_; err = aq_hw_err_from_flags(self); -- 2.35.1