* [PATCH] skye/skge: sparse fix - data can't ever be bigger than LONG_MAX / HZ
@ 2007-10-26 22:10 Auke Kok
2007-10-26 22:12 ` Stephen Hemminger
2007-10-29 10:05 ` Jeff Garzik
0 siblings, 2 replies; 6+ messages in thread
From: Auke Kok @ 2007-10-26 22:10 UTC (permalink / raw)
To: shemminger; +Cc: netdev
Trivial replacement - use INT_MAX instead here.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Cc: shemminger@linux-foundation.org
---
drivers/net/sk98lin/skethtool.c | 4 ++--
drivers/net/skge.c | 8 ++++----
drivers/net/sky2.c | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c
index 5a6da89..4549b97 100644
--- a/drivers/net/sk98lin/skethtool.c
+++ b/drivers/net/sk98lin/skethtool.c
@@ -430,8 +430,8 @@ static int locateDevice(struct net_device *dev, u32 data)
DEV_NET *pNet = netdev_priv(dev);
SK_AC *pAC = pNet->pAC;
- if(!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
- data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
+ if (!data)
+ data = INT_MAX;
/* start blinking */
pAC->LedsOn = 0;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index b9961dc..696a79e 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -783,10 +783,10 @@ static int skge_phys_id(struct net_device *dev, u32 data)
unsigned long ms;
enum led_mode mode = LED_MODE_TST;
- if (!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
- ms = jiffies_to_msecs(MAX_SCHEDULE_TIMEOUT / HZ) * 1000;
- else
- ms = data * 1000;
+ if (!data)
+ data = INT_MAX;
+
+ ms = data * HZ;
while (ms > 0) {
skge_led(skge, mode);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index c27c7d6..1381d04 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3336,10 +3336,10 @@ static int sky2_phys_id(struct net_device *dev, u32 data)
int interrupted;
int onoff = 1;
- if (!data || data > (u32) (MAX_SCHEDULE_TIMEOUT / HZ))
- ms = jiffies_to_msecs(MAX_SCHEDULE_TIMEOUT);
- else
- ms = data * 1000;
+ if (!data)
+ data = INT_MAX:
+
+ ms = data * HZ;
/* save initial values */
spin_lock_bh(&sky2->phy_lock);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] skye/skge: sparse fix - data can't ever be bigger than LONG_MAX / HZ
2007-10-26 22:10 [PATCH] skye/skge: sparse fix - data can't ever be bigger than LONG_MAX / HZ Auke Kok
@ 2007-10-26 22:12 ` Stephen Hemminger
2007-10-26 22:15 ` Kok, Auke
2007-10-29 10:05 ` Jeff Garzik
1 sibling, 1 reply; 6+ messages in thread
From: Stephen Hemminger @ 2007-10-26 22:12 UTC (permalink / raw)
To: Auke Kok; +Cc: netdev
On Fri, 26 Oct 2007 15:10:28 -0700
Auke Kok <auke-jan.h.kok@intel.com> wrote:
> Trivial replacement - use INT_MAX instead here.
>
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> Cc: shemminger@linux-foundation.org
Acked-by: Stephen Hemminger <shemminger@linux-foundation.org>
Sure that works. Note: original code was copied from e100 which I assume
is why you found/fixed this case.
--
Stephen Hemminger <shemminger@linux-foundation.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] skye/skge: sparse fix - data can't ever be bigger than LONG_MAX / HZ
2007-10-26 22:12 ` Stephen Hemminger
@ 2007-10-26 22:15 ` Kok, Auke
0 siblings, 0 replies; 6+ messages in thread
From: Kok, Auke @ 2007-10-26 22:15 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
Stephen Hemminger wrote:
> On Fri, 26 Oct 2007 15:10:28 -0700
> Auke Kok <auke-jan.h.kok@intel.com> wrote:
>
>> Trivial replacement - use INT_MAX instead here.
>>
>> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
>> Cc: shemminger@linux-foundation.org
>
> Acked-by: Stephen Hemminger <shemminger@linux-foundation.org>
>
> Sure that works. Note: original code was copied from e100 which I assume
> is why you found/fixed this case.
I went over your sparse fixes and decided to fix that last warning that you had
not fixed. I thought I might as well fix those poor drivers that copied our
bad-ass code ;)
still testing the code you sent me though... hopefully not much longer.
Auke
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] skye/skge: sparse fix - data can't ever be bigger than LONG_MAX / HZ
2007-10-26 22:10 [PATCH] skye/skge: sparse fix - data can't ever be bigger than LONG_MAX / HZ Auke Kok
2007-10-26 22:12 ` Stephen Hemminger
@ 2007-10-29 10:05 ` Jeff Garzik
2007-10-29 15:32 ` Stephen Hemminger
1 sibling, 1 reply; 6+ messages in thread
From: Jeff Garzik @ 2007-10-29 10:05 UTC (permalink / raw)
To: Auke Kok; +Cc: shemminger, netdev
Auke Kok wrote:
> Trivial replacement - use INT_MAX instead here.
>
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> Cc: shemminger@linux-foundation.org
> ---
>
> drivers/net/sk98lin/skethtool.c | 4 ++--
> drivers/net/skge.c | 8 ++++----
> drivers/net/sky2.c | 8 ++++----
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c
> index 5a6da89..4549b97 100644
> --- a/drivers/net/sk98lin/skethtool.c
> +++ b/drivers/net/sk98lin/skethtool.c
> @@ -430,8 +430,8 @@ static int locateDevice(struct net_device *dev, u32 data)
> DEV_NET *pNet = netdev_priv(dev);
> SK_AC *pAC = pNet->pAC;
>
> - if(!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
> - data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
> + if (!data)
> + data = INT_MAX;
>
> /* start blinking */
> pAC->LedsOn = 0;
> diff --git a/drivers/net/skge.c b/drivers/net/skge.c
> index b9961dc..696a79e 100644
> --- a/drivers/net/skge.c
> +++ b/drivers/net/skge.c
> @@ -783,10 +783,10 @@ static int skge_phys_id(struct net_device *dev, u32 data)
> unsigned long ms;
> enum led_mode mode = LED_MODE_TST;
>
> - if (!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
> - ms = jiffies_to_msecs(MAX_SCHEDULE_TIMEOUT / HZ) * 1000;
> - else
> - ms = data * 1000;
> + if (!data)
> + data = INT_MAX;
> +
> + ms = data * HZ;
>
> while (ms > 0) {
> skge_led(skge, mode);
> diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
> index c27c7d6..1381d04 100644
> --- a/drivers/net/sky2.c
> +++ b/drivers/net/sky2.c
> @@ -3336,10 +3336,10 @@ static int sky2_phys_id(struct net_device *dev, u32 data)
> int interrupted;
> int onoff = 1;
>
> - if (!data || data > (u32) (MAX_SCHEDULE_TIMEOUT / HZ))
> - ms = jiffies_to_msecs(MAX_SCHEDULE_TIMEOUT);
> - else
> - ms = data * 1000;
> + if (!data)
> + data = INT_MAX:
> +
> + ms = data * HZ;
ditto comments in previous email...
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] skye/skge: sparse fix - data can't ever be bigger than LONG_MAX / HZ
2007-10-29 10:05 ` Jeff Garzik
@ 2007-10-29 15:32 ` Stephen Hemminger
2007-10-29 15:48 ` Jeff Garzik
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Hemminger @ 2007-10-29 15:32 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Auke Kok, netdev
On Mon, 29 Oct 2007 06:05:14 -0400
Jeff Garzik <jeff@garzik.org> wrote:
> Auke Kok wrote:
> > Trivial replacement - use INT_MAX instead here.
> >
> > Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> > Cc: shemminger@linux-foundation.org
> > ---
> >
> > drivers/net/sk98lin/skethtool.c | 4 ++--
> > drivers/net/skge.c | 8 ++++----
> > drivers/net/sky2.c | 8 ++++----
> > 3 files changed, 10 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c
> > index 5a6da89..4549b97 100644
> > --- a/drivers/net/sk98lin/skethtool.c
> > +++ b/drivers/net/sk98lin/skethtool.c
> > @@ -430,8 +430,8 @@ static int locateDevice(struct net_device *dev, u32 data)
> > DEV_NET *pNet = netdev_priv(dev);
> > SK_AC *pAC = pNet->pAC;
> >
> > - if(!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
> > - data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
> > + if (!data)
> > + data = INT_MAX;
> >
> > /* start blinking */
> > pAC->LedsOn = 0;
> > diff --git a/drivers/net/skge.c b/drivers/net/skge.c
> > index b9961dc..696a79e 100644
> > --- a/drivers/net/skge.c
> > +++ b/drivers/net/skge.c
> > @@ -783,10 +783,10 @@ static int skge_phys_id(struct net_device *dev, u32 data)
> > unsigned long ms;
> > enum led_mode mode = LED_MODE_TST;
> >
> > - if (!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
> > - ms = jiffies_to_msecs(MAX_SCHEDULE_TIMEOUT / HZ) * 1000;
> > - else
> > - ms = data * 1000;
> > + if (!data)
> > + data = INT_MAX;
> > +
> > + ms = data * HZ;
> >
> > while (ms > 0) {
> > skge_led(skge, mode);
> > diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
> > index c27c7d6..1381d04 100644
> > --- a/drivers/net/sky2.c
> > +++ b/drivers/net/sky2.c
> > @@ -3336,10 +3336,10 @@ static int sky2_phys_id(struct net_device *dev, u32 data)
> > int interrupted;
> > int onoff = 1;
> >
> > - if (!data || data > (u32) (MAX_SCHEDULE_TIMEOUT / HZ))
> > - ms = jiffies_to_msecs(MAX_SCHEDULE_TIMEOUT);
> > - else
> > - ms = data * 1000;
> > + if (!data)
> > + data = INT_MAX:
> > +
> > + ms = data * HZ;
>
> ditto comments in previous email...
Since these all use ethtool, shouldn't the checks be put into ethtool_phys_id
rather than having the driver check?
--
Stephen Hemminger <shemminger@linux-foundation.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] skye/skge: sparse fix - data can't ever be bigger than LONG_MAX / HZ
2007-10-29 15:32 ` Stephen Hemminger
@ 2007-10-29 15:48 ` Jeff Garzik
0 siblings, 0 replies; 6+ messages in thread
From: Jeff Garzik @ 2007-10-29 15:48 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Auke Kok, netdev
Stephen Hemminger wrote:
> Since these all use ethtool, shouldn't the checks be put into ethtool_phys_id
> rather than having the driver check?
Seems quite reasonable to me.
Jeff
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-10-29 15:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-26 22:10 [PATCH] skye/skge: sparse fix - data can't ever be bigger than LONG_MAX / HZ Auke Kok
2007-10-26 22:12 ` Stephen Hemminger
2007-10-26 22:15 ` Kok, Auke
2007-10-29 10:05 ` Jeff Garzik
2007-10-29 15:32 ` Stephen Hemminger
2007-10-29 15:48 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).