diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2019-12-01 18:41:25 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-12-01 13:21:24 -0800 |
| commit | 8a574f86652a4540a2433946ba826ccb87f398cc (patch) | |
| tree | 721cdbb01ff7e864a864f31e93ef97cc2cdc6702 /net | |
| parent | openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info() (diff) | |
| download | linux-dev-8a574f86652a4540a2433946ba826ccb87f398cc.tar.xz linux-dev-8a574f86652a4540a2433946ba826ccb87f398cc.zip | |
openvswitch: remove another BUG_ON()
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>
Diffstat (limited to 'net')
| -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 8cab3435d8da..1047e8043084 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1372,7 +1372,10 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info) OVS_FLOW_CMD_DEL, ufid_flags); 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 { @@ -1380,6 +1383,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: |