Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ed8f48e authored by Paolo Abeni's avatar Paolo Abeni Committed by Greg Kroah-Hartman
Browse files

openvswitch: remove another BUG_ON() 



[ Upstream commit 8a574f86652a4540a2433946ba826ccb87f398cc ]

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: aed06778 ("openvswitch: Minimize ovs_flow_cmd_del critical section.")
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e48458f

net/openvswitch/datapath.c

+5 −1
Original line number Diff line number Diff line
@@ -1345,7 +1345,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 {
@@ -1353,6 +1356,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: