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

Commit a734d1f4 authored by Eelco Chaudron's avatar Eelco Chaudron Committed by David S. Miller
Browse files

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: default avatarDavide Caratti <dcaratti@redhat.com>
Signed-off-by: default avatarEelco Chaudron <echaudro@redhat.com>
Acked-by: default avatarFlavio Leitner <fbl@sysclose.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3aa4c491

net/openvswitch/datapath.c

+5 −2
Original line number Diff line number Diff line
@@ -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);

	}