xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Sarah Newman <srn@prgmr.com>
To: xen-devel@lists.xen.org
Cc: minios-devel@lists.xen.org, Sarah Newman <srn@prgmr.com>
Subject: [PATCH] Mini-OS: netfront: fix off-by-one error introduced in 7c8f3483
Date: Wed, 23 Mar 2016 14:26:51 -0700	[thread overview]
Message-ID: <1458768411-6024-1-git-send-email-srn@prgmr.com> (raw)

7c8f3483 introduced a break within a loop in netfront.c such that
cons and nr_consumed were no longer always being incremented. The
offset at cons will be processed multiple times with the break in
place.

Remove the break and re-add "some !=0" in the loop for HAVE_LIBC.

Signed-off-by: Sarah Newman <srn@prgmr.com>
---
 netfront.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/netfront.c b/netfront.c
index 0eca5b5..557e8c4 100644
--- a/netfront.c
+++ b/netfront.c
@@ -108,8 +108,10 @@ moretodo:
 
 #ifdef HAVE_LIBC
     some = 0;
-#endif
+    for (cons = dev->rx.rsp_cons; (cons != rp) && !some; nr_consumed++, cons++)
+#else
     for (cons = dev->rx.rsp_cons; cons != rp; nr_consumed++, cons++)
+#endif
     {
         struct net_buffer* buf;
         unsigned char* page;
@@ -135,7 +137,6 @@ moretodo:
 		memcpy(dev->data, page+rx->offset, len);
 		dev->rlen = len;
 		some = 1;
-                break;
 	    } else
 #endif
 		dev->netif_rx(page+rx->offset,rx->status);
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

             reply	other threads:[~2016-03-23 21:26 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-23 21:26 Sarah Newman [this message]
2016-03-25 13:09 ` [PATCH] Mini-OS: netfront: fix off-by-one error introduced in 7c8f3483 Wei Liu
2016-03-25 18:33   ` Samuel Thibault
2016-03-25 19:19     ` Sarah Newman
2016-03-25 19:32       ` Samuel Thibault
2016-03-25 19:56         ` Sarah Newman
2016-03-26 20:53     ` Sarah Newman
2016-03-30 13:46       ` Wei Liu
2016-04-01 18:17 Samuel Thibault
2016-04-01 18:26 ` Samuel Thibault
2016-04-01 18:26 Samuel Thibault
2016-04-04 10:28 ` Wei Liu
2016-04-25 11:14   ` Wei Liu

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=1458768411-6024-1-git-send-email-srn@prgmr.com \
    --to=srn@prgmr.com \
    --cc=minios-devel@lists.xen.org \
    --cc=xen-devel@lists.xen.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).