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

Commit 970bfcd0 authored by Paul Blakey's avatar Paul Blakey Committed by David S. Miller
Browse files

net/sched: cls_flower: Use mask for addr_type 



When addr_type is set, mask should also be set.

Fixes: 66530bdf ('sched,cls_flower: set key address type when present')
Fixes: bc3103f1 ('net/sched: cls_flower: Classify packet in ip tunnels')
Signed-off-by: default avatarPaul Blakey <paulb@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83a77e9e

net/sched/cls_flower.c

+4 −0
Original line number Diff line number Diff line
@@ -509,6 +509,7 @@ static int fl_set_key(struct net *net, struct nlattr **tb, 


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

		key->control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;

		mask->control.addr_type = ~0;

		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));
@@ -517,6 +518,7 @@ static int fl_set_key(struct net *net, struct nlattr **tb, 
			       sizeof(key->ipv4.dst));

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

		key->control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;

		mask->control.addr_type = ~0;

		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));
@@ -571,6 +573,7 @@ static int fl_set_key(struct net *net, struct nlattr **tb, 
	if (tb[TCA_FLOWER_KEY_ENC_IPV4_SRC] ||

	    tb[TCA_FLOWER_KEY_ENC_IPV4_DST]) {

		key->enc_control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;

		mask->enc_control.addr_type = ~0;

		fl_set_key_val(tb, &key->enc_ipv4.src,

			       TCA_FLOWER_KEY_ENC_IPV4_SRC,

			       &mask->enc_ipv4.src,
@@ -586,6 +589,7 @@ static int fl_set_key(struct net *net, struct nlattr **tb, 
	if (tb[TCA_FLOWER_KEY_ENC_IPV6_SRC] ||

	    tb[TCA_FLOWER_KEY_ENC_IPV6_DST]) {

		key->enc_control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;

		mask->enc_control.addr_type = ~0;

		fl_set_key_val(tb, &key->enc_ipv6.src,

			       TCA_FLOWER_KEY_ENC_IPV6_SRC,

			       &mask->enc_ipv6.src,