Commit 7e48458f authored Dec 01, 2019 by Paolo Abeni Committed by Greg Kroah-Hartman Dec 05, 2019

openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info()



[ Upstream commit 8ffeb03fbba3b599690b361467bfd2373e8c450f ]

All the callers of ovs_flow_cmd_build_info() already deal with
error return code correctly, so we can handle the error condition
in a more gracefull way. Still dump a warning to preserve
debuggability.

v1 -> v2:
 - clarify the commit message
 - clean the skb and report the error (DaveM)

Fixes: ccb1352e ("net: Add Open vSwitch kernel components.")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0c6e6cea

net/openvswitch/datapath.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -879,7 +879,10 @@ static struct sk_buff ovs_flow_cmd_build_info(const struct sw_flow flow,
		retval = ovs_flow_cmd_fill_info(flow, dp_ifindex, skb,
		info->snd_portid, info->snd_seq, 0,
		cmd, ufid_flags);
		BUG_ON(retval < 0);
		if (WARN_ON_ONCE(retval < 0)) {
		kfree_skb(skb);
		skb = ERR_PTR(retval);
		}
		return skb;
		}