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 6B73DC433EF for ; Fri, 26 Nov 2021 02:46:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359649AbhKZCuD (ORCPT ); Thu, 25 Nov 2021 21:50:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:50878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358608AbhKZCrZ (ORCPT ); Thu, 25 Nov 2021 21:47:25 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1848C6137C; Fri, 26 Nov 2021 02:37:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637894234; bh=Yp3aTiRbFD0i59Zgh7OndLs7xoZGCTgvfoXKC8kppMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UV3uJAOxHTWRW+Cq1+ANQ0PrsA0DO67LbK9VvRvPKNyxwkzFhwb2VXu8wxb4pt660 E2b7PJzdwXtaJ6Qf4Lnson6rGGN1ThlNVAKheJAWJ1oPRF2zCPgpzhDZzA/MotBt8p CSyyOsVjfy/YE8ENEqgpe4vC4dRnIb+39KVfUSPnxGu2BatnHAATqY8RGst9naKSDj rUokpUh9OaUf5IwV1hr9VOOmSIz32OJoMv7X8JU0fS6g38vqhXao/1tGQAEL5bRhiA PtEfp+NEPf1ZZoMS/5Mf/CEExP2BEPbp+//H1tEKHyq3Ky1ErpXCNkNdEaFYdZgKzL 5qqBcm2j0VqHA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: zhangyue , "David S . Miller" , Sasha Levin , kuba@kernel.org, arnd@arndb.de, tanghui20@huawei.com, starmiku1207184332@gmail.com, netdev@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 5/6] net: tulip: de4x5: fix the problem that the array 'lp->phy[8]' may be out of bound Date: Thu, 25 Nov 2021 21:37:00 -0500 Message-Id: <20211126023701.443472-5-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211126023701.443472-1-sashal@kernel.org> References: <20211126023701.443472-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: zhangyue [ Upstream commit 61217be886b5f7402843677e4be7e7e83de9cb41 ] In line 5001, if all id in the array 'lp->phy[8]' is not 0, when the 'for' end, the 'k' is 8. At this time, the array 'lp->phy[8]' may be out of bound. Signed-off-by: zhangyue Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/dec/tulip/de4x5.c | 30 +++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c index 7799cf33cc6e2..7c4150a83a082 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c @@ -4992,19 +4992,23 @@ mii_get_phy(struct net_device *dev) } if ((j == limit) && (i < DE4X5_MAX_MII)) { for (k=0; k < DE4X5_MAX_PHY && lp->phy[k].id; k++); - lp->phy[k].addr = i; - lp->phy[k].id = id; - lp->phy[k].spd.reg = GENERIC_REG; /* ANLPA register */ - lp->phy[k].spd.mask = GENERIC_MASK; /* 100Mb/s technologies */ - lp->phy[k].spd.value = GENERIC_VALUE; /* TX & T4, H/F Duplex */ - lp->mii_cnt++; - lp->active++; - printk("%s: Using generic MII device control. If the board doesn't operate,\nplease mail the following dump to the author:\n", dev->name); - j = de4x5_debug; - de4x5_debug |= DEBUG_MII; - de4x5_dbg_mii(dev, k); - de4x5_debug = j; - printk("\n"); + if (k < DE4X5_MAX_PHY) { + lp->phy[k].addr = i; + lp->phy[k].id = id; + lp->phy[k].spd.reg = GENERIC_REG; /* ANLPA register */ + lp->phy[k].spd.mask = GENERIC_MASK; /* 100Mb/s technologies */ + lp->phy[k].spd.value = GENERIC_VALUE; /* TX & T4, H/F Duplex */ + lp->mii_cnt++; + lp->active++; + printk("%s: Using generic MII device control. If the board doesn't operate,\nplease mail the following dump to the author:\n", dev->name); + j = de4x5_debug; + de4x5_debug |= DEBUG_MII; + de4x5_dbg_mii(dev, k); + de4x5_debug = j; + printk("\n"); + } else { + goto purgatory; + } } } purgatory: -- 2.33.0