diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2019-12-01 18:41:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-05 09:21:31 +0100 |
| commit | 7e48458fd1f7a355c86527ad35fac012ae64c025 (patch) | |
| tree | 314bca19d1399c4b6424db796664233a45c86dd3 /net | |
| parent | 0c6e6ceae72c9bdb8834352190c6cafcd0b3c21d (diff) | |
| download | linux-stable-7e48458fd1f7a355c86527ad35fac012ae64c025.tar.gz linux-stable-7e48458fd1f7a355c86527ad35fac012ae64c025.tar.bz2 linux-stable-7e48458fd1f7a355c86527ad35fac012ae64c025.zip | |
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: ccb1352e76cf ("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>
Diffstat (limited to '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 cb2968b975a3..aa829be08d60 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -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; } |