odp-util: Fix parsing corner case for encap_nsh() actions.

When nothing matched, the code would loop forever. Found with libfuzzer. Reported-by: Bhargava Shastry <[email protected]> Signed-off-by: Ben Pfaff <[email protected]> Acked-by: Jan Scheurich <[email protected]>
marbindrakon · Dec 1, 2017 · 0884990 · 0884990
1 parent 59b1e02
commit 0884990
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/odp-util.c b/lib/odp-util.c
@@ -1870,6 +1870,9 @@ parse_odp_encap_nsh_action(const char *s, struct ofpbuf *actions)
             }
             continue;
         }
+
+        ret = -EINVAL;
+        goto out;
     }
 out:
     if (ret < 0) {

diff --git a/tests/odp.at b/tests/odp.at
@@ -362,3 +362,11 @@ AT_CHECK_UNQUOTED([ovstest test-odp parse-actions < actions.txt], [0],
   [`cat actions.txt`
 ])
 AT_CLEANUP
+
+AT_SETUP([OVS datapath actions parsing and formatting - invalid forms])
+dnl This caused a hang in older versions.
+AT_CHECK([echo 'encap_nsh@:{@' | ovstest test-odp parse-actions
+], [0], [dnl
+odp_actions_from_string: error
+])
+AT_CLEANUP