* [PATCH 1/2][next][V2] net: usb: asix: Fix less than zero comparison of a u16
@ 2021-06-09 10:24 Colin King
2021-06-09 10:24 ` [PATCH 2/2][next][V2] net: usb: asix: ax88772: " Colin King
2021-06-09 22:30 ` [PATCH 1/2][next][V2] net: usb: asix: " patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2021-06-09 10:24 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski, Oleksij Rempel, linux-usb, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
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 <colin.king@canonical.com>
---
V2: Add new line, return ret instead of priv->phy_addr on error return path
---
drivers/net/usb/asix_devices.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 57dafb3262d9..334741a8595d 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -704,9 +704,11 @@ 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)
- return priv->phy_addr;
+ ret = asix_read_phy_addr(dev, true);
+ if (ret < 0)
+ return ret;
+
+ priv->phy_addr = ret;
snprintf(priv->phy_name, sizeof(priv->phy_name), PHY_ID_FMT,
priv->mdio->id, priv->phy_addr);
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2][next][V2] net: usb: asix: ax88772: Fix less than zero comparison of a u16
2021-06-09 10:24 [PATCH 1/2][next][V2] net: usb: asix: Fix less than zero comparison of a u16 Colin King
@ 2021-06-09 10:24 ` Colin King
2021-06-09 22:30 ` [PATCH 1/2][next][V2] net: usb: asix: " patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Colin King @ 2021-06-09 10:24 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski, Oleksij Rempel, linux-usb, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
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.
Fixes: 7e88b11a862a ("net: usb: asix: refactor asix_read_phy_addr() and handle errors on return")
Addresses-Coverity: ("Unsigned compared against 0")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
V2: fix up return check.
---
drivers/net/usb/ax88172a.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index 2e2081346740..530947d7477b 100644
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -205,11 +205,11 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
goto free;
}
- priv->phy_addr = asix_read_phy_addr(dev, priv->use_embdphy);
- if (priv->phy_addr < 0) {
- ret = priv->phy_addr;
+ ret = asix_read_phy_addr(dev, priv->use_embdphy);
+ if (ret < 0)
goto free;
- }
+
+ priv->phy_addr = ret;
ax88172a_reset_phy(dev, priv->use_embdphy);
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2][next][V2] net: usb: asix: Fix less than zero comparison of a u16
2021-06-09 10:24 [PATCH 1/2][next][V2] net: usb: asix: Fix less than zero comparison of a u16 Colin King
2021-06-09 10:24 ` [PATCH 2/2][next][V2] net: usb: asix: ax88772: " Colin King
@ 2021-06-09 22:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-09 22:30 UTC (permalink / raw)
To: Colin King
Cc: davem, kuba, linux, linux-usb, netdev, kernel-janitors, linux-kernel
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Wed, 9 Jun 2021 11:24:47 +0100 you wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> 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.
>
> [...]
Here is the summary with links:
- [1/2,next,V2] net: usb: asix: Fix less than zero comparison of a u16
https://git.kernel.org/netdev/net-next/c/e67665946599
- [2/2,next,V2] net: usb: asix: ax88772: Fix less than zero comparison of a u16
https://git.kernel.org/netdev/net-next/c/c6be5a22fde5
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-09 22:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-09 10:24 [PATCH 1/2][next][V2] net: usb: asix: Fix less than zero comparison of a u16 Colin King
2021-06-09 10:24 ` [PATCH 2/2][next][V2] net: usb: asix: ax88772: " Colin King
2021-06-09 22:30 ` [PATCH 1/2][next][V2] net: usb: asix: " patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.