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

Commit f2a01517 authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

openvswitch: Fix flow mask validation. 



Following patch fixes typo in the flow validation. This prevented
installation of ARP and IPv6 flows.

Fixes: 19e7a3df ("openvswitch: Fix NDP flow mask validation")
Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Reviewed-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4fc11e61

net/openvswitch/flow_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static bool match_validate(const struct sw_flow_match *match, 
	if (match->key->eth.type == htons(ETH_P_ARP)

			|| match->key->eth.type == htons(ETH_P_RARP)) {

		key_expected |= 1 << OVS_KEY_ATTR_ARP;

		if (match->mask && (match->mask->key.tp.src == htons(0xff)))

		if (match->mask && (match->mask->key.eth.type == htons(0xffff)))

			mask_allowed |= 1 << OVS_KEY_ATTR_ARP;

	}
@@ -220,7 +220,7 @@ static bool match_validate(const struct sw_flow_match *match, 
						htons(NDISC_NEIGHBOUR_SOLICITATION) ||

				    match->key->tp.src == htons(NDISC_NEIGHBOUR_ADVERTISEMENT)) {

					key_expected |= 1 << OVS_KEY_ATTR_ND;

					if (match->mask && (match->mask->key.tp.src == htons(0xffff)))

					if (match->mask && (match->mask->key.tp.src == htons(0xff)))

						mask_allowed |= 1 << OVS_KEY_ATTR_ND;

				}

			}