From 323e2b8ef07fa8672be00e53b9f19ecd754cc9b7 Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Mon, 21 Jan 2013 03:59:17 -0800 Subject: [PATCH] datapath: Return correct error code when dumping flow actions. Currently, if there isn't enough space to store the actions in a flow during a dump we return -ENOMEM. However, the standard error in this situation is -EMSGSIZE so this changes the behavior to match. This issue was introduced in 354d4c98a8cdaae3525848f564e58a9016bcd3af (datapath: Fix nelink attribute size for flow.). Signed-off-by: Jesse Gross Acked-by: Ben Pfaff --- datapath/datapath.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index 2b43774d3..a4ecfa5e4 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -1223,10 +1223,8 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp, nla_nest_cancel(skb, start); } - } else if (skb_orig_len) { - err = -ENOMEM; - goto error; - } + } else if (skb_orig_len) + goto nla_put_failure; return genlmsg_end(skb, ovs_header); -- 2.20.1