Message ID | 20200916173311.30956-18-gvrose8192@gmail.com |
---|---|
State | Changes Requested |
Headers | show |
Series | Add support for Linux kernels up to 5.8.x | expand |
On Wed, Sep 16, 2020 at 10:36 AM Greg Rose <gvrose8192@gmail.com> wrote: > > From: Paolo Abeni <pabeni@redhat.com> > > Upstream commit: > commit 8a574f86652a4540a2433946ba826ccb87f398cc > Author: Paolo Abeni <pabeni@redhat.com> > Date: Sun Dec 1 18:41:25 2019 +0100 > > 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> > > Cc: Paolo Abeni <pabeni@redhat.com> > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
diff --git a/datapath/datapath.c b/datapath/datapath.c index 877c8bdba..deffb3a60 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -1414,7 +1414,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, &ovs_dp_flow_multicast_group, reply, info); } else { genl_set_err(&dp_flow_genl_family, sock_net(skb->sk), 0, @@ -1423,6 +1426,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: