From: Ben Pfaff <blp@nicira.com>
Date: Tue, 15 Feb 2011 18:07:20 +0000 (-0800)
Subject: dpif-netdev: Fix segfault handling packets.
X-Git-Tag: v1.1.0~278
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ed4031e4676affcb39962942ff437382d8f30c27;p=sliver-openvswitch.git

dpif-netdev: Fix segfault handling packets.

Reported-by: Hassan Khan <hassan.khan@seecs.edu.pk>
---

diff --git a/AUTHORS b/AUTHORS
index c48479fc2..4116ada9b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -50,6 +50,7 @@ Derek Cormier           derek.cormier@lab.ntt.co.jp
 DK Moon                 dkmoon@nicira.com
 Gaetano Catalli         gaetano.catalli@gmail.com
 Ghanem Bahri            bahri.ghanem@gmail.com
+Hassan Khan             hassan.khan@seecs.edu.pk
 Hector Oron             hector.oron@gmail.com
 Henrik Amren            henrik@nicira.com
 Jad Naous               jnaous@gmail.com
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 93dd1cde9..035ceaedd 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -1315,7 +1315,7 @@ dp_netdev_output_control(struct dp_netdev *dp, const struct ofpbuf *packet,
     upcall->key_len = key_len;
     upcall->userdata = arg;
 
-    q->upcalls[++q->head & QUEUE_MASK] = upcall;
+    q->upcalls[q->head++ & QUEUE_MASK] = upcall;
 
     return 0;
 }