evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flow_dissector: Fix MPLS entropy label handling in flow dissector

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

Fixes: b3baa0fbd0 ("mpls: Add MPLS entropy label in flow_keys")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tom Herbert 2015-06-12 09:01:05 -07:00 • committed by David S. Miller
parent b60f2f3d65
commit 611d23c559
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/core/flow_dissector.c
View file

@ -299,8 +299,8 @@ mpls:
if (!hdr) if (!hdr)
return false; return false;
if ((ntohl(hdr[0].entry) & MPLS_LS_LABEL_MASK) == if ((ntohl(hdr[0].entry) & MPLS_LS_LABEL_MASK) >>
MPLS_LABEL_ENTROPY) { MPLS_LS_LABEL_SHIFT == MPLS_LABEL_ENTROPY) {
if (skb_flow_dissector_uses_key(flow_dissector, if (skb_flow_dissector_uses_key(flow_dissector,
FLOW_DISSECTOR_KEY_MPLS_ENTROPY)) { FLOW_DISSECTOR_KEY_MPLS_ENTROPY)) {
key_keyid = skb_flow_dissector_target(flow_dissector, key_keyid = skb_flow_dissector_target(flow_dissector,