Message ID | 20200916173311.30956-17-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:34 AM Greg Rose <gvrose8192@gmail.com> wrote: > > From: Paolo Abeni <pabeni@redhat.com> > > Upstream commit: > commit 8ffeb03fbba3b599690b361467bfd2373e8c450f > Author: Paolo Abeni <pabeni@redhat.com> > Date: Sun Dec 1 18:41:24 2019 +0100 > > 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> > > 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 047b3312e..877c8bdba 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -946,7 +946,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; }