| Message ID | 20210608152249.160333-2-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/2,next] net: usb: asix: Fix less than zero comparison of a u16 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | warning | 3 maintainers not CCed: bjorn@mork.no hkallweit1@gmail.com george.kennedy@oracle.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 9 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Tue, Jun 08, 2021 at 04:22:49PM +0100, Colin King 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. > > 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. > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > 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 > >
On 08/06/2021 19:11, Oleksij Rempel wrote: > On Tue, Jun 08, 2021 at 04:22:49PM +0100, Colin King 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. >> >> 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; + } + > >> Signed-off-by: Colin Ian King <colin.king@canonical.com> >> --- >> 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. > >> if (priv->phy_addr < 0) { >> ret = priv->phy_addr; >> goto free; >> -- >> 2.31.1 >> >> >
On Wed, Jun 09, 2021 at 10:51:09AM +0100, Colin Ian King wrote: > On 08/06/2021 19:11, Oleksij Rempel wrote: > > On Tue, Jun 08, 2021 at 04:22:49PM +0100, Colin King 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. > >> > >> 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. > > > >> Signed-off-by: Colin Ian King <colin.king@canonical.com> > >> --- > >> 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. > > > > >> if (priv->phy_addr < 0) { > >> ret = priv->phy_addr; > >> goto free; > >> -- > >> 2.31.1 > >> > >> > > > >
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;