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 <pshelar@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Bug #14767
* properly sized for single flows.
*/
start = nla_nest_start(skb, OVS_FLOW_ATTR_ACTIONS);
* 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;
- nla_nest_end(skb, start);
return genlmsg_end(skb, ovs_header);
return genlmsg_end(skb, ovs_header);