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

Commit 0fff9bd4 authored by Kangjie Lu's avatar Kangjie Lu Committed by David S. Miller
Browse files

net: openvswitch: fix missing checks for nla_nest_start 



nla_nest_start may fail and thus deserves a check.
The fix returns -EMSGSIZE when it fails.

Signed-off-by: default avatarKangjie Lu <kjlu@umn.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f19893b

net/openvswitch/datapath.c

+8 −0
Original line number Diff line number Diff line
@@ -464,6 +464,10 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, 


	if (upcall_info->egress_tun_info) {

		nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_EGRESS_TUN_KEY);

		if (!nla) {

			err = -EMSGSIZE;

			goto out;

		}

		err = ovs_nla_put_tunnel_info(user_skb,

					      upcall_info->egress_tun_info);

		BUG_ON(err);
@@ -472,6 +476,10 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, 


	if (upcall_info->actions_len) {

		nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_ACTIONS);

		if (!nla) {

			err = -EMSGSIZE;

			goto out;

		}

		err = ovs_nla_put_actions(upcall_info->actions,

					  upcall_info->actions_len,

					  user_skb);