[PATCH 1/2][next] net: usb: asix: Fix less than zero comparison of a u16

Subsystems: networking drivers, the rest, usb networking drivers

STALE1889d

7 messages, 3 authors, 2021-06-09 · open the first message on its own page

[PATCH 1/2][next] net: usb: asix: Fix less than zero comparison of a u16

From: Colin King <hidden>
Date: 2021-06-08 15:23:12 

From: Colin Ian King <redacted>

The comparison of the u16 priv->phy_addr < 0 is always false because
phy_addr is unsigned. Fix this by assigning the return from the call
to function asix_read_phy_addr to int ret and using this for the
less than zero error check comparison.

Addresses-Coverity: ("Unsigned compared against 0")
Fixes: e532a096be0e ("net: usb: asix: ax88772: add phylib support")
Signed-off-by: Colin Ian King <redacted>
---
 drivers/net/usb/asix_devices.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 57dafb3262d9..211c5a87eb15 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -704,9 +704,10 @@ static int ax88772_init_phy(struct usbnet *dev)
 	struct asix_common_private *priv = dev->driver_priv;
 	int ret;
 
-	priv->phy_addr = asix_read_phy_addr(dev, true);
-	if (priv->phy_addr < 0)
+	ret = asix_read_phy_addr(dev, true);
+	if (ret < 0)
 		return priv->phy_addr;
+	priv->phy_addr = ret;
 
 	snprintf(priv->phy_name, sizeof(priv->phy_name), PHY_ID_FMT,
 		 priv->mdio->id, priv->phy_addr);
-- 
2.31.1

[PATCH 2/2][next] net: usb: asix: ax88772: net: Fix less than zero comparison of a u16

From: Colin King <hidden>
Date: 2021-06-08 15:23:23 

From: Colin Ian King <redacted>

The comparison of the u16 priv->phy_addr < 0 is always false because
phy_addr is unsigned. Fix this by assigning the return from the call
to function asix_read_phy_addr to int ret and using this for the
less than zero error check comparison.

Addresses-Coverity: ("Unsigned compared against 0")
Fixes: 7e88b11a862a ("net: usb: asix: refactor asix_read_phy_addr() and handle errors on return")
Signed-off-by: Colin Ian King <redacted>
---
 drivers/net/usb/ax88172a.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index 2e2081346740..e24773bb9398 100644
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -205,7 +205,8 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
 		goto free;
 	}
 
-	priv->phy_addr = asix_read_phy_addr(dev, priv->use_embdphy);
+	ret = asix_read_phy_addr(dev, priv->use_embdphy);
+	priv->phy_addr = ret;
 	if (priv->phy_addr < 0) {
 		ret = priv->phy_addr;
 		goto free;
-- 
2.31.1

Re: [PATCH 1/2][next] net: usb: asix: Fix less than zero comparison of a u16

From: Oleksij Rempel <o.rempel@pengutronix.de>
Date: 2021-06-08 17:58:32 

On Tue, Jun 08, 2021 at 04:22:48PM +0100, Colin King wrote:
quoted hunk
From: Colin Ian King <redacted>

The comparison of the u16 priv->phy_addr < 0 is always false because
phy_addr is unsigned. Fix this by assigning the return from the call
to function asix_read_phy_addr to int ret and using this for the
less than zero error check comparison.

Addresses-Coverity: ("Unsigned compared against 0")
Fixes: e532a096be0e ("net: usb: asix: ax88772: add phylib support")
Signed-off-by: Colin Ian King <redacted>
---
 drivers/net/usb/asix_devices.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 57dafb3262d9..211c5a87eb15 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -704,9 +704,10 @@ static int ax88772_init_phy(struct usbnet *dev)
 	struct asix_common_private *priv = dev->driver_priv;
 	int ret;
 
-	priv->phy_addr = asix_read_phy_addr(dev, true);
-	if (priv->phy_addr < 0)
+	ret = asix_read_phy_addr(dev, true);
+	if (ret < 0)
 		return priv->phy_addr;
please add new line here
+	priv->phy_addr = ret;
 
 	snprintf(priv->phy_name, sizeof(priv->phy_name), PHY_ID_FMT,
 		 priv->mdio->id, priv->phy_addr);
-- 
2.31.1
Thank you!

Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH 2/2][next] net: usb: asix: ax88772: net: Fix less than zero comparison of a u16

From: Oleksij Rempel <o.rempel@pengutronix.de>
Date: 2021-06-08 18:11:45 

On Tue, Jun 08, 2021 at 04:22:49PM +0100, Colin King wrote:
From: Colin Ian King <redacted>

The comparison of the u16 priv->phy_addr < 0 is always false because
phy_addr is unsigned. Fix this by assigning the return from the call
to function asix_read_phy_addr to int ret and using this for the
less than zero error check comparison.

Addresses-Coverity: ("Unsigned compared against 0")
Fixes: 7e88b11a862a ("net: usb: asix: refactor asix_read_phy_addr() and handle errors on return")
Here is wrong Fixes tag. This assignment was bogus before this patch.
quoted hunk
Signed-off-by: Colin Ian King <redacted>
---
 drivers/net/usb/ax88172a.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index 2e2081346740..e24773bb9398 100644
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -205,7 +205,8 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
 		goto free;
 	}
 
-	priv->phy_addr = asix_read_phy_addr(dev, priv->use_embdphy);
+	ret = asix_read_phy_addr(dev, priv->use_embdphy);
+	priv->phy_addr = ret;
Ah.. it is same bug in different color :)
You probably wonted to do:
	if (ret < 0)
		goto free;

	priv->phy_addr = ret;

 	if (priv->phy_addr < 0) {
 		ret = priv->phy_addr;
 		goto free;
-- 
2.31.1

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH 1/2][next] net: usb: asix: Fix less than zero comparison of a u16

From: Dan Carpenter <hidden>
Date: 2021-06-09 09:28:36 

On Tue, Jun 08, 2021 at 04:22:48PM +0100, Colin King wrote:
quoted hunk
From: Colin Ian King <redacted>

The comparison of the u16 priv->phy_addr < 0 is always false because
phy_addr is unsigned. Fix this by assigning the return from the call
to function asix_read_phy_addr to int ret and using this for the
less than zero error check comparison.

Addresses-Coverity: ("Unsigned compared against 0")
Fixes: e532a096be0e ("net: usb: asix: ax88772: add phylib support")
Signed-off-by: Colin Ian King <redacted>
---
 drivers/net/usb/asix_devices.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 57dafb3262d9..211c5a87eb15 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -704,9 +704,10 @@ static int ax88772_init_phy(struct usbnet *dev)
 	struct asix_common_private *priv = dev->driver_priv;
 	int ret;
 
-	priv->phy_addr = asix_read_phy_addr(dev, true);
-	if (priv->phy_addr < 0)
+	ret = asix_read_phy_addr(dev, true);
+	if (ret < 0)
 		return priv->phy_addr;
		return ret;

regards,
dan carpenter

Re: [PATCH 2/2][next] net: usb: asix: ax88772: net: Fix less than zero comparison of a u16

From: Colin Ian King <hidden>
Date: 2021-06-09 09:51:16 

On 08/06/2021 19:11, Oleksij Rempel wrote:
On Tue, Jun 08, 2021 at 04:22:49PM +0100, Colin King wrote:
quoted
From: Colin Ian King <redacted>

The comparison of the u16 priv->phy_addr < 0 is always false because
phy_addr is unsigned. Fix this by assigning the return from the call
to function asix_read_phy_addr to int ret and using this for the
less than zero error check comparison.

Addresses-Coverity: ("Unsigned compared against 0")
Fixes: 7e88b11a862a ("net: usb: asix: refactor asix_read_phy_addr() and handle errors on return")
Here is wrong Fixes tag. This assignment was bogus before this patch.
I'm not sure that's correct, that commit has the following change in it:

diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index b404c9462dce..c8ca5187eece 100644
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -220,6 +220,11 @@ static int ax88172a_bind(struct usbnet *dev, struct
usb_interface *intf)
        }

        priv->phy_addr = asix_read_phy_addr(dev, priv->use_embdphy);
+       if (priv->phy_addr < 0) {
+               ret = priv->phy_addr;
+               goto free;
+       }
+


quoted
Signed-off-by: Colin Ian King <redacted>
---
 drivers/net/usb/ax88172a.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index 2e2081346740..e24773bb9398 100644
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -205,7 +205,8 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
 		goto free;
 	}
 
-	priv->phy_addr = asix_read_phy_addr(dev, priv->use_embdphy);
+	ret = asix_read_phy_addr(dev, priv->use_embdphy);
+	priv->phy_addr = ret;
Ah.. it is same bug in different color :)
You probably wonted to do:
	if (ret < 0)
		goto free;

	priv->phy_addr = ret;
Doh, brain failure of mine. I'll send a V2 later today.

quoted
 	if (priv->phy_addr < 0) {
 		ret = priv->phy_addr;
 		goto free;
-- 
2.31.1






  

    
Re: [PATCH 2/2][next] net: usb: asix: ax88772: net: Fix less than zero comparison of a u16

    

      From: Oleksij Rempel <o.rempel@pengutronix.de>

      Date: 2021-06-09 11:52:27 
    

  

  
On Wed, Jun 09, 2021 at 10:51:09AM +0100, Colin Ian King wrote:
quoted hunk
On 08/06/2021 19:11, Oleksij Rempel wrote:
quoted
On Tue, Jun 08, 2021 at 04:22:49PM +0100, Colin King wrote:
quoted
From: Colin Ian King <redacted>

The comparison of the u16 priv->phy_addr < 0 is always false because
phy_addr is unsigned. Fix this by assigning the return from the call
to function asix_read_phy_addr to int ret and using this for the
less than zero error check comparison.

Addresses-Coverity: ("Unsigned compared against 0")
Fixes: 7e88b11a862a ("net: usb: asix: refactor asix_read_phy_addr() and handle errors on return")
Here is wrong Fixes tag. This assignment was bogus before this patch.
I'm not sure that's correct, that commit has the following change in it:

diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index b404c9462dce..c8ca5187eece 100644
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -220,6 +220,11 @@ static int ax88172a_bind(struct usbnet *dev, struct
usb_interface *intf)
        }

        priv->phy_addr = asix_read_phy_addr(dev, priv->use_embdphy);
+       if (priv->phy_addr < 0) {
+               ret = priv->phy_addr;
+               goto free;
+       }
+
Even before my patch asix_read_phy_addr() was returning different
error values. My patch just add check for the return value.

quoted
quoted
Signed-off-by: Colin Ian King <redacted>
---
 drivers/net/usb/ax88172a.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index 2e2081346740..e24773bb9398 100644
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -205,7 +205,8 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
 		goto free;
 	}
 
-	priv->phy_addr = asix_read_phy_addr(dev, priv->use_embdphy);
+	ret = asix_read_phy_addr(dev, priv->use_embdphy);
+	priv->phy_addr = ret;
Ah.. it is same bug in different color :)
You probably wonted to do:
	if (ret < 0)
		goto free;

	priv->phy_addr = ret;
Doh, brain failure of mine. I'll send a V2 later today.

quoted
quoted
 	if (priv->phy_addr < 0) {
 		ret = priv->phy_addr;
 		goto free;
-- 
2.31.1

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |




    
  

  
    

      

        Keyboard shortcuts
      

      

        
          
hback out one level

          
jnext message in thread

          
kprevious message in thread

          
ldrill in

          
Escclose help / fold thread tree

          
?toggle this help