Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18e10a9e authored by Valentina Goncharenko's avatar Valentina Goncharenko Committed by Greg Kroah-Hartman
Browse files

net: encx24j600: Fix invalid logic in reading of MISTAT register 



[ Upstream commit 25f427ac7b8d89b0259f86c0c6407b329df742b2 ]

A loop for reading MISTAT register continues while regmap_read() fails
and (mistat & BUSY), but if regmap_read() fails a value of mistat is
undefined.

The patch proposes to check for BUSY flag only when regmap_read()
succeed. Compile test only.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: d70e5326 ("net: Microchip encx24j600 driver")
Signed-off-by: default avatarValentina Goncharenko <goncharenko.vp@ispras.ru>
Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1356c177

drivers/net/ethernet/microchip/encx24j600-regmap.c

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static int regmap_encx24j600_phy_reg_read(void *context, unsigned int reg, 
		goto err_out;



	usleep_range(26, 100);

	while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) != 0) &&

	while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) == 0) &&

	       (mistat & BUSY))

		cpu_relax();
@@ -402,7 +402,7 @@ static int regmap_encx24j600_phy_reg_write(void *context, unsigned int reg, 
		goto err_out;



	usleep_range(26, 100);

	while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) != 0) &&

	while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) == 0) &&

	       (mistat & BUSY))

		cpu_relax();