Skip to contentSkip to conversation

net: openvswitch: return an error instead of doing BUG_ON()

PATCH Applied Eelco Chaudron 3 participants 3 messages May 2, 2019 – May 4, 2019

Subsystems (3)
Networking Network drivers Openvswitch
lore
Share & tools
lore

Eelco Chaudron

author maintainer
#0 lore raw

PATCH 1/1 net: openvswitch: return an error instead of doing BUG_ON()

For all other error cases in queue_userspace_packet() the error is returned, so it makes sense to do the same for these two error cases.

Reported-by Davide Caratti <[email protected]>
Signed-off-by Eelco Chaudron <[email protected]>
---
 net/openvswitch/datapath.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
net/openvswitch/datapath.c +5 -2
index b95015c..dc9ff93 100644
@@ -455,7 +455,8 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
 	upcall->dp_ifindex = dp_ifindex;
 
 	err = ovs_nla_put_key(key, key, OVS_PACKET_ATTR_KEY, false, user_skb);
-	BUG_ON(err);
+	if (err)
+		goto out;
 
 	if (upcall_info->userdata)
 		__nla_put(user_skb, OVS_PACKET_ATTR_USERDATA,

@@ -471,7 +472,9 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
 		}
 		err = ovs_nla_put_tunnel_info(user_skb,
 					      upcall_info->egress_tun_info);
-		BUG_ON(err);
+		if (err)
+			goto out;
+
 		nla_nest_end(user_skb, nla);
 	}