From acdf66b53c3538f77608768931da034ec4717045 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Sun, 20 Jan 2013 23:14:36 -0800 Subject: [PATCH] datapath: Fix Flow dump operation. Following patch adds null check while inserting new netlink attribute. This was introduced by commit 9b405f1aa8d175d (datapath: More flexible kernel/userspace tunneling attribute.) Signed-off-by: Pravin B Shelar Acked-by: Ben Pfaff Bug #14767 --- datapath/datapath.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/datapath/datapath.c b/datapath/datapath.c index d363cd7f1..4aeae5d47 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -1213,10 +1213,15 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp, * properly sized for single flows. */ start = nla_nest_start(skb, OVS_FLOW_ATTR_ACTIONS); - err = actions_to_attr(sf_acts->actions, sf_acts->actions_len, skb); - if (err < 0 && skb_orig_len) + 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); + } else if (skb_orig_len) { + err = -ENOMEM; goto error; - nla_nest_end(skb, start); + } return genlmsg_end(skb, ovs_header); -- 2.20.1