From: Ben Pfaff <blp@nicira.com>
Date: Mon, 21 Jan 2013 11:59:16 +0000 (-0800)
Subject: datapath: Don't dump partial action lists in flows.
X-Git-Tag: sliver-openvswitch-1.9.90-3~8^2~8
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=0a25b0394a967509fb6a1da9547248bae62e8131

datapath: Don't dump partial action lists in flows.

After commit 9b405f1aa8d175dc63ad3ffe5d0fe05d5ee09162 (datapath: More
flexible kernel/userspace tunneling attribute.), it was possible for a
flow dump to return a partial action list.  It's better to return no
action list at all in this situation since then userspace will know
that it should request the full thing if it wants rather than have
incorrect results.  Therefore, this prevents those partial lists in
situations where we have a very large number of actions.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
---

diff --git a/datapath/datapath.c b/datapath/datapath.c
index ed3dd090e..0f4796ea3 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1111,9 +1111,14 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
 	start = nla_nest_start(skb, OVS_FLOW_ATTR_ACTIONS);
 	if (start) {
 		err = actions_to_attr(sf_acts->actions, sf_acts->actions_len, skb);
-		if (err < 0 && skb_orig_len)
-			goto error;
-		nla_nest_end(skb, start);
+		if (!err)
+			nla_nest_end(skb, start);
+		else {
+			if (skb_orig_len)
+				goto error;
+
+			nla_nest_cancel(skb, start);
+		}
 	} else if (skb_orig_len) {
 		err = -ENOMEM;
 		goto error;