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

Commit 66c7a5ee authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

ovs: align nlattr properly when needed 



I also fix commit 8b32ab9e6ef1: use nla_total_size_64bit() for
OVS_FLOW_ATTR_USED in ovs_flow_cmd_msg_size().

Fixes: 8b32ab9e6ef1 ("ovs: use nla_put_u64_64bit()")
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ed46d12

include/uapi/linux/openvswitch.h

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ enum ovs_datapath_attr { 
	OVS_DP_ATTR_STATS,		/* struct ovs_dp_stats */

	OVS_DP_ATTR_MEGAFLOW_STATS,	/* struct ovs_dp_megaflow_stats */

	OVS_DP_ATTR_USER_FEATURES,	/* OVS_DP_F_*  */

	OVS_DP_ATTR_PAD,

	__OVS_DP_ATTR_MAX

};
@@ -253,6 +254,7 @@ enum ovs_vport_attr { 
	OVS_VPORT_ATTR_UPCALL_PID, /* array of u32 Netlink socket PIDs for */

				/* receiving upcalls */

	OVS_VPORT_ATTR_STATS,	/* struct ovs_vport_stats */

	OVS_VPORT_ATTR_PAD,

	__OVS_VPORT_ATTR_MAX

};

net/openvswitch/datapath.c

+15 −12
Original line number Diff line number Diff line
@@ -738,9 +738,9 @@ static size_t ovs_flow_cmd_msg_size(const struct sw_flow_actions *acts, 
		len += nla_total_size(acts->orig_len);



	return len

		+ nla_total_size(sizeof(struct ovs_flow_stats)) /* OVS_FLOW_ATTR_STATS */

		+ nla_total_size_64bit(sizeof(struct ovs_flow_stats)) /* OVS_FLOW_ATTR_STATS */

		+ nla_total_size(1) /* OVS_FLOW_ATTR_TCP_FLAGS */

		+ nla_total_size(8); /* OVS_FLOW_ATTR_USED */

		+ nla_total_size_64bit(8); /* OVS_FLOW_ATTR_USED */

}



/* Called with ovs_mutex or RCU read lock. */
@@ -759,7 +759,9 @@ static int ovs_flow_cmd_fill_stats(const struct sw_flow *flow, 
		return -EMSGSIZE;



	if (stats.n_packets &&

	    nla_put(skb, OVS_FLOW_ATTR_STATS, sizeof(struct ovs_flow_stats), &stats))

	    nla_put_64bit(skb, OVS_FLOW_ATTR_STATS,

			  sizeof(struct ovs_flow_stats), &stats,

			  OVS_FLOW_ATTR_PAD))

		return -EMSGSIZE;



	if ((u8)ntohs(tcp_flags) &&
@@ -1435,8 +1437,8 @@ static size_t ovs_dp_cmd_msg_size(void) 
	size_t msgsize = NLMSG_ALIGN(sizeof(struct ovs_header));



	msgsize += nla_total_size(IFNAMSIZ);

	msgsize += nla_total_size(sizeof(struct ovs_dp_stats));

	msgsize += nla_total_size(sizeof(struct ovs_dp_megaflow_stats));

	msgsize += nla_total_size_64bit(sizeof(struct ovs_dp_stats));

	msgsize += nla_total_size_64bit(sizeof(struct ovs_dp_megaflow_stats));

	msgsize += nla_total_size(sizeof(u32)); /* OVS_DP_ATTR_USER_FEATURES */



	return msgsize;
@@ -1463,13 +1465,13 @@ static int ovs_dp_cmd_fill_info(struct datapath *dp, struct sk_buff *skb, 
		goto nla_put_failure;



	get_dp_stats(dp, &dp_stats, &dp_megaflow_stats);

	if (nla_put(skb, OVS_DP_ATTR_STATS, sizeof(struct ovs_dp_stats),

			&dp_stats))

	if (nla_put_64bit(skb, OVS_DP_ATTR_STATS, sizeof(struct ovs_dp_stats),

			  &dp_stats, OVS_DP_ATTR_PAD))

		goto nla_put_failure;



	if (nla_put(skb, OVS_DP_ATTR_MEGAFLOW_STATS,

	if (nla_put_64bit(skb, OVS_DP_ATTR_MEGAFLOW_STATS,

			  sizeof(struct ovs_dp_megaflow_stats),

			&dp_megaflow_stats))

			  &dp_megaflow_stats, OVS_DP_ATTR_PAD))

		goto nla_put_failure;



	if (nla_put_u32(skb, OVS_DP_ATTR_USER_FEATURES, dp->user_features))
@@ -1838,8 +1840,9 @@ static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb, 
		goto nla_put_failure;



	ovs_vport_get_stats(vport, &vport_stats);

	if (nla_put(skb, OVS_VPORT_ATTR_STATS, sizeof(struct ovs_vport_stats),

		    &vport_stats))

	if (nla_put_64bit(skb, OVS_VPORT_ATTR_STATS,

			  sizeof(struct ovs_vport_stats), &vport_stats,

			  OVS_VPORT_ATTR_PAD))

		goto nla_put_failure;



	if (ovs_vport_get_upcall_portids(vport, skb))