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

Commit 66530bdf authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

sched,cls_flower: set key address type when present 



only when user space passes the addresses should we consider their
presence

Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83d15e70

net/sched/cls_flower.c

+8 −2
Original line number Diff line number Diff line
@@ -252,23 +252,28 @@ static int fl_set_key(struct net *net, struct nlattr **tb, 
	fl_set_key_val(tb, key->eth.src, TCA_FLOWER_KEY_ETH_SRC,

		       mask->eth.src, TCA_FLOWER_KEY_ETH_SRC_MASK,

		       sizeof(key->eth.src));



	fl_set_key_val(tb, &key->basic.n_proto, TCA_FLOWER_KEY_ETH_TYPE,

		       &mask->basic.n_proto, TCA_FLOWER_UNSPEC,

		       sizeof(key->basic.n_proto));



	if (key->basic.n_proto == htons(ETH_P_IP) ||

	    key->basic.n_proto == htons(ETH_P_IPV6)) {

		fl_set_key_val(tb, &key->basic.ip_proto, TCA_FLOWER_KEY_IP_PROTO,

			       &mask->basic.ip_proto, TCA_FLOWER_UNSPEC,

			       sizeof(key->basic.ip_proto));

	}

	if (key->control.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {



	if (tb[TCA_FLOWER_KEY_IPV4_SRC] || tb[TCA_FLOWER_KEY_IPV4_DST]) {

		key->control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;

		fl_set_key_val(tb, &key->ipv4.src, TCA_FLOWER_KEY_IPV4_SRC,

			       &mask->ipv4.src, TCA_FLOWER_KEY_IPV4_SRC_MASK,

			       sizeof(key->ipv4.src));

		fl_set_key_val(tb, &key->ipv4.dst, TCA_FLOWER_KEY_IPV4_DST,

			       &mask->ipv4.dst, TCA_FLOWER_KEY_IPV4_DST_MASK,

			       sizeof(key->ipv4.dst));

	} else if (key->control.addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {

	} else if (tb[TCA_FLOWER_KEY_IPV6_SRC] || tb[TCA_FLOWER_KEY_IPV6_DST]) {

		key->control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;

		fl_set_key_val(tb, &key->ipv6.src, TCA_FLOWER_KEY_IPV6_SRC,

			       &mask->ipv6.src, TCA_FLOWER_KEY_IPV6_SRC_MASK,

			       sizeof(key->ipv6.src));
@@ -276,6 +281,7 @@ static int fl_set_key(struct net *net, struct nlattr **tb, 
			       &mask->ipv6.dst, TCA_FLOWER_KEY_IPV6_DST_MASK,

			       sizeof(key->ipv6.dst));

	}



	if (key->basic.ip_proto == IPPROTO_TCP) {

		fl_set_key_val(tb, &key->tp.src, TCA_FLOWER_KEY_TCP_SRC,

			       &mask->tp.src, TCA_FLOWER_UNSPEC,