From: Roel Kluin <roel.kluin@gmail.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] net: off by one, try #2
Date: Wed, 11 Feb 2009 11:01:56 +0100 [thread overview]
Message-ID: <4992A214.2040300@gmail.com> (raw)
Better?
-------------------->8----------------8<-----------------------
With while (x++ < n) { ... } x can reach n+1.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
drivers/net/3c505.c | 4 ++--
drivers/net/irda/mcs7780.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index 6124605..fb74846 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -500,9 +500,9 @@ static bool receive_pcb(struct net_device *dev, pcb_struct * pcb)
pcb->data.raw[i++] = inb_command(dev->base_addr);
if (i > MAX_PCB_DATA)
INVALID_PCB_MSG(i);
- } while ((stat & ASF_PCB_MASK) != ASF_PCB_END && j < 20000);
+ } while ((stat & ASF_PCB_MASK) != ASF_PCB_END && j <= 20000);
spin_unlock_irqrestore(&adapter->lock, flags);
- if (j >= 20000) {
+ if (j > 20000) {
TIMEOUT_MSG(__LINE__);
return false;
}
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 7eafdca..b4f4f19 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -585,7 +585,7 @@ static int mcs_speed_change(struct mcs_cb *mcs)
mcs_get_reg(mcs, MCS_RESV_REG, &rval);
} while(cnt++ < 100 && (rval & MCS_IRINTX));
- if(cnt >= 100) {
+ if(cnt > 100) {
IRDA_ERROR("unable to change speed\n");
ret = -EIO;
goto error;
next reply other threads:[~2009-02-11 10:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-11 10:01 Roel Kluin [this message]
2009-02-11 13:33 ` [PATCH] net: off by one, try #2 Jarek Poplawski
2009-02-11 14:22 ` Roel Kluin
2009-02-11 17:14 ` Jarek Poplawski
2009-02-11 19:33 ` Roel Kluin
2009-02-11 20:27 ` Jarek Poplawski
2009-02-11 20:58 ` Jarek Poplawski
2009-02-11 22:55 ` [PATCH] 3c505: do not set pcb->data.raw beyond its size Roel Kluin
2009-02-12 6:37 ` Jarek Poplawski
2009-02-13 0:52 ` David Miller
2009-02-11 21:22 ` [PATCH] IRDA: cnt is off by 1 Roel Kluin
2009-02-13 0:42 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4992A214.2040300@gmail.com \
--to=roel.kluin@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).