diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2019-12-01 18:41:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-01 13:21:24 -0800 |
| commit | 8ffeb03fbba3b599690b361467bfd2373e8c450f (patch) | |
| tree | a77e9595e699465130d9f38250e4ba282e7255e8 | |
| parent | f3284e014850e45f63fbc74c7382453c876fbc35 (diff) | |
| download | linux-8ffeb03fbba3b599690b361467bfd2373e8c450f.tar.bz2 | |
openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info()
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: ccb1352e76cf ("net: Add Open vSwitch kernel components.")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/openvswitch/datapath.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 293d5289c4a1..8cab3435d8da 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -905,7 +905,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; } |