Commit e754ec69 authored by Joe Stringer's avatar Joe Stringer Committed by David S. Miller
Browse files

openvswitch: Serialize nested ct actions if provided 



If userspace provides a ct action with no nested mark or label, then the
storage for these fields is zeroed. Later when actions are requested,
such zeroed fields are serialized even though userspace didn't
originally specify them. Fix the behaviour by ensuring that no action is
serialized in this case, and reject actions where userspace attempts to
set these fields with mask=0. This should make netlink marshalling
consistent across deserialization/reserialization.

Reported-by: default avatarJarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: default avatarJoe Stringer <joestringer@nicira.com>
Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f0909ee

net/openvswitch/conntrack.c

+10 −4
Original line number Diff line number Diff line
@@ -224,9 +224,6 @@ static int ovs_ct_set_labels(struct sk_buff *skb, struct sw_flow_key *key, 
	struct nf_conn *ct;

	int err;



	if (!IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS))

		return -ENOTSUPP;



	/* The connection could be invalid, in which case set_label is no-op.*/

	ct = nf_ct_get(skb, &ctinfo);

	if (!ct)
@@ -587,6 +584,10 @@ static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info, 
		case OVS_CT_ATTR_MARK: {

			struct md_mark *mark = nla_data(a);



			if (!mark->mask) {

				OVS_NLERR(log, "ct_mark mask cannot be 0");

				return -EINVAL;

			}

			info->mark = *mark;

			break;

		}
@@ -595,6 +596,10 @@ static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info, 
		case OVS_CT_ATTR_LABELS: {

			struct md_labels *labels = nla_data(a);



			if (!labels_nonzero(&labels->mask)) {

				OVS_NLERR(log, "ct_labels mask cannot be 0");

				return -EINVAL;

			}

			info->labels = *labels;

			break;

		}
@@ -705,11 +710,12 @@ int ovs_ct_action_to_attr(const struct ovs_conntrack_info *ct_info, 
	if (IS_ENABLED(CONFIG_NF_CONNTRACK_ZONES) &&

	    nla_put_u16(skb, OVS_CT_ATTR_ZONE, ct_info->zone.id))

		return -EMSGSIZE;

	if (IS_ENABLED(CONFIG_NF_CONNTRACK_MARK) &&

	if (IS_ENABLED(CONFIG_NF_CONNTRACK_MARK) && ct_info->mark.mask &&

	    nla_put(skb, OVS_CT_ATTR_MARK, sizeof(ct_info->mark),

		    &ct_info->mark))

		return -EMSGSIZE;

	if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) &&

	    labels_nonzero(&ct_info->labels.mask) &&

	    nla_put(skb, OVS_CT_ATTR_LABELS, sizeof(ct_info->labels),

		    &ct_info->labels))

		return -EMSGSIZE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE