datapath: Check for positive packet length in vport_send().
authorJesse Gross <jesse@nicira.com>
Mon, 13 May 2013 15:27:21 +0000 (08:27 -0700)
committerJesse Gross <jesse@nicira.com>
Mon, 13 May 2013 15:47:09 +0000 (08:47 -0700)
When sending a packet, a positive length indicates success and a
negative length indicates failure. However, the check for success
looked for non-zero values which catches both of these cases. This
can result in incorrect stats and leak memory on failure.

Introduced by commit be7cd27e44258bdb3c4e7dd8fd7389b5db56d55a (datapath:
Unify vport error stats handling.).

CC: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Kyle Mestery <kmestery@cisco.com>
datapath/vport.c

index 93ab2b5..745ffe4 100644 (file)
@@ -382,7 +382,7 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
 {
        int sent = vport->ops->send(vport, skb);
 
-       if (likely(sent)) {
+       if (likely(sent > 0)) {
                struct pcpu_tstats *stats;
 
                stats = this_cpu_ptr(vport->percpu_stats);