diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2019-12-01 18:41:25 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-02-11 20:03:52 +0000 |
| commit | d21c1d923294f1a9cc96a90849dc1fae59de6fa7 (patch) | |
| tree | 0248e6dc7bb71c4f9fa59c047cdb82ece2966f3e | |
| parent | 2584c958c3ee1b4a6b1a7052418c29029c56f7ec (diff) | |
| download | linux-d21c1d923294f1a9cc96a90849dc1fae59de6fa7.tar.gz linux-d21c1d923294f1a9cc96a90849dc1fae59de6fa7.tar.bz2 linux-d21c1d923294f1a9cc96a90849dc1fae59de6fa7.zip | |
openvswitch: remove another BUG_ON()
commit 8a574f86652a4540a2433946ba826ccb87f398cc upstream.
If we can't build the flow del notification, we can simply delete
the flow, no need to crash the kernel. Still keep a WARN_ON to
preserve debuggability.
Note: the BUG_ON() predates the Fixes tag, but this change
can be applied only after the mentioned commit.
v1 -> v2:
- do not leak an skb on error
Fixes: aed067783e50 ("openvswitch: Minimize ovs_flow_cmd_del critical section.")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/openvswitch/datapath.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 9dcb7903c01a..b92826982177 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1136,7 +1136,10 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info) info->snd_seq, 0, OVS_FLOW_CMD_DEL); rcu_read_unlock(); - BUG_ON(err < 0); + if (WARN_ON_ONCE(err < 0)) { + kfree_skb(reply); + goto out_free; + } ovs_notify(&dp_flow_genl_family, reply, info); } else { @@ -1144,6 +1147,7 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info) } } +out_free: ovs_flow_free(flow, true); return 0; unlock: |