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

Commit 611d23c5 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

flow_dissector: Fix MPLS entropy label handling in flow dissector 



Need to shift after masking to get label value for comparison.

Fixes: b3baa0fb ("mpls: Add MPLS entropy label in flow_keys")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b60f2f3d

net/core/flow_dissector.c

+2 −2
Original line number Diff line number Diff line
@@ -299,8 +299,8 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
		if (!hdr)

			return false;



		if ((ntohl(hdr[0].entry) & MPLS_LS_LABEL_MASK) ==

		     MPLS_LABEL_ENTROPY) {

		if ((ntohl(hdr[0].entry) & MPLS_LS_LABEL_MASK) >>

		     MPLS_LS_LABEL_SHIFT == MPLS_LABEL_ENTROPY) {

			if (skb_flow_dissector_uses_key(flow_dissector,

							FLOW_DISSECTOR_KEY_MPLS_ENTROPY)) {

				key_keyid = skb_flow_dissector_target(flow_dissector,