From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Teng Qi <starmiku1207184332@gmail.com>,
TOTE Robot <oslab@tsinghua.edu.cn>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
yisen.zhuang@huawei.com, salil.mehta@huawei.com, kuba@kernel.org,
huangguangbin2@huawei.com, lipeng321@huawei.com,
zhengyongjun3@huawei.com, shenyang39@huawei.com,
liuyonglong@huawei.com, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 22/28] ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in hns_dsaf_ge_srst_by_port()
Date: Thu, 25 Nov 2021 21:33:37 -0500 [thread overview]
Message-ID: <20211126023343.442045-22-sashal@kernel.org> (raw)
In-Reply-To: <20211126023343.442045-1-sashal@kernel.org>
From: Teng Qi <starmiku1207184332@gmail.com>
[ Upstream commit a66998e0fbf213d47d02813b9679426129d0d114 ]
The if statement:
if (port >= DSAF_GE_NUM)
return;
limits the value of port less than DSAF_GE_NUM (i.e., 8).
However, if the value of port is 6 or 7, an array overflow could occur:
port_rst_off = dsaf_dev->mac_cb[port]->port_rst_off;
because the length of dsaf_dev->mac_cb is DSAF_MAX_PORT_NUM (i.e., 6).
To fix this possible array overflow, we first check port and if it is
greater than or equal to DSAF_MAX_PORT_NUM, the function returns.
Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Teng Qi <starmiku1207184332@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
index a9aca8c24e90d..aa87e4d121532 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
@@ -400,6 +400,10 @@ static void hns_dsaf_ge_srst_by_port(struct dsaf_device *dsaf_dev, u32 port,
return;
if (!HNS_DSAF_IS_DEBUG(dsaf_dev)) {
+ /* DSAF_MAX_PORT_NUM is 6, but DSAF_GE_NUM is 8.
+ We need check to prevent array overflow */
+ if (port >= DSAF_MAX_PORT_NUM)
+ return;
reg_val_1 = 0x1 << port;
port_rst_off = dsaf_dev->mac_cb[port]->port_rst_off;
/* there is difference between V1 and V2 in register.*/
--
2.33.0
next prev parent reply other threads:[~2021-11-26 2:40 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 2:33 [PATCH AUTOSEL 5.10 01/28] gfs2: release iopen glock early in evict Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 02/28] gfs2: Fix length of holes reported at end-of-file Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 03/28] powerpc/pseries/ddw: Revert "Extend upper limit for huge DMA window for persistent memory" Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 04/28] drm/sun4i: fix unmet dependency on RESET_CONTROLLER for PHY_SUN6I_MIPI_DPHY Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 05/28] mac80211: do not access the IV when it was stripped Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 06/28] tun: fix bonding active backup with arp monitoring Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 07/28] net/smc: Transfer remaining wait queue entries during fallback Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 08/28] atlantic: Fix OOB read and write in hw_atl_utils_fw_rpc_wait Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 09/28] net: return correct error code Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 10/28] pinctrl: amd: Fix wakeups when IRQ is shared with SCI Sasha Levin
2021-11-29 14:47 ` Limonciello, Mario
2021-11-29 18:53 ` Limonciello, Mario
2021-12-03 18:25 ` Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 11/28] pinctrl: qcom: fix unmet dependencies on GPIOLIB for GPIOLIB_IRQCHIP Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 12/28] platform/x86: thinkpad_acpi: Add support for dual fan control Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 13/28] platform/x86: thinkpad_acpi: Fix WWAN device disabled issue after S3 deep Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 14/28] s390/setup: avoid using memblock_enforce_memory_limit Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 15/28] btrfs: check-integrity: fix a warning on write caching disabled disk Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 16/28] thermal: core: Reset previous low and high trip during thermal zone init Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 17/28] scsi: iscsi: Unblock session then wake up error handler Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 18/28] drm/amd/amdkfd: Fix kernel panic when reset failed and been triggered again Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 19/28] drm/amd/amdgpu: fix potential memleak Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 20/28] ata: ahci: Add Green Sardine vendor ID as board_ahci_mobile Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 21/28] ata: libahci: Adjust behavior when StorageD3Enable _DSD is set Sasha Levin
2021-11-26 2:33 ` Sasha Levin [this message]
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 23/28] ipv6: check return value of ipv6_skip_exthdr Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 24/28] net: tulip: de4x5: fix the problem that the array 'lp->phy[8]' may be out of bound Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 25/28] net: ethernet: dec: tulip: de4x5: fix possible array overflows in type3_infoblock() Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 26/28] perf inject: Fix ARM SPE handling Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 27/28] perf hist: Fix memory leak of a perf_hpp_fmt Sasha Levin
2021-11-26 2:33 ` [PATCH AUTOSEL 5.10 28/28] perf report: Fix memory leaks around perf_tip() Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211126023343.442045-22-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=huangguangbin2@huawei.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lipeng321@huawei.com \
--cc=liuyonglong@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=oslab@tsinghua.edu.cn \
--cc=salil.mehta@huawei.com \
--cc=shenyang39@huawei.com \
--cc=stable@vger.kernel.org \
--cc=starmiku1207184332@gmail.com \
--cc=yisen.zhuang@huawei.com \
--cc=zhengyongjun3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).