Merge "Vrouter to return error for invalid flow op" into R2.20

Juniper · Mar 7, 2016 · 5fc4e98 · 5fc4e98
2 parents 2193da9 + c145211
commit 5fc4e98
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/dp-core/vr_flow.c b/dp-core/vr_flow.c
@@ -1567,6 +1567,15 @@ vr_flow_set_req_is_invalid(struct vrouter *router, vr_flow_req *req,
                 goto invalid_req;
             }
         }
+    } else {
+        /*
+         * flow set request received with an index which is
+         * not active anymore, return ENOENT error
+         */
+        if ((req->fr_flags & VR_FLOW_FLAG_ACTIVE) && !(req->fr_index < 0)) {
+            error = -ENOENT;
+            goto invalid_req;
+        }
     }
 
     if (req->fr_flags & VR_FLOW_FLAG_VRFT) {