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

Commit c064efca authored by roel kluin's avatar roel kluin Committed by David S. Miller
Browse files

usbnet: test off by one 



With `while (i++ < MII_TIMEOUT)' i reaches MII_TIMEOUT + 1 after the loop
This is probably unlikely a problem in practice.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce739b47

drivers/net/usb/rtl8150.c

+2 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg) 
		get_registers(dev, PHYCNT, 1, data);

	} while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));



	if (i < MII_TIMEOUT) {

	if (i <= MII_TIMEOUT) {

		get_registers(dev, PHYDAT, 2, data);

		*reg = data[0] | (data[1] << 8);

		return 0;
@@ -295,7 +295,7 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg) 
		get_registers(dev, PHYCNT, 1, data);

	} while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));



	if (i < MII_TIMEOUT)

	if (i <= MII_TIMEOUT)

		return 0;

	else

		return 1;