Commit f549c98a authored Oct 01, 2019 by Yizhuo Committed by Greg Kroah-Hartman Oct 29, 2019

net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write()



[ Upstream commit 53de429f4e88f538f7a8ec2b18be8c0cd9b2c8e1 ]

In function mdio_sc_cfg_reg_write(), variable "reg_value" could be
uninitialized if regmap_read() fails. However, "reg_value" is used
to decide the control flow later in the if statement, which is
potentially unsafe.

Signed-off-by: Yizhuo <yzhai003@ucr.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent b742b54c

drivers/net/ethernet/hisilicon/hns_mdio.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -166,11 +166,15 @@ static int mdio_sc_cfg_reg_write(struct hns_mdio_device *mdio_dev,
		{
		u32 time_cnt;
		u32 reg_value;
		int ret;

		regmap_write(mdio_dev->subctrl_vbase, cfg_reg, set_val);

		for (time_cnt = MDIO_TIMEOUT; time_cnt; time_cnt--) {
		regmap_read(mdio_dev->subctrl_vbase, st_reg, &reg_value);
		ret = regmap_read(mdio_dev->subctrl_vbase, st_reg, &reg_value);
		if (ret)
		return ret;

		reg_value &= st_msk;
		if ((!!check_st) == (!!reg_value))
		break;