MIPS: bpf: Use correct mask for VLAN_TAG case

Using VLAN_VID_MASK is not correct to get the vlan tag. Use
~VLAN_PRESENT_MASK instead and make sure it's u16 so the top 16-bits
will be removed. This will ensure that the emit_andi() code will not
treat this as a big 32-bit unsigned value.

Signed-off-by: Markos Chandras <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: Daniel Borkmann <[email protected]>
Cc: Alexei Starovoitov <[email protected]>
Cc: [email protected]
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/7127/
Signed-off-by: Ralf Baechle <[email protected]>

diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 500f97fdc0e148b2638ae74666bbf6cf282f46b5..a4d1b76e73731f97f4be96153f995994934a5163 100644 (file)
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -1317,7 +1317,7 @@ jmp_cmp:
                        off = offsetof(struct sk_buff, vlan_tci);
                        emit_half_load(r_s0, r_skb, off, ctx);
                        if (code == (BPF_ANC | SKF_AD_VLAN_TAG))
-                               emit_andi(r_A, r_s0, VLAN_VID_MASK, ctx);
+                               emit_andi(r_A, r_s0, (u16)~VLAN_TAG_PRESENT, ctx);
                        else
                                emit_andi(r_A, r_s0, VLAN_TAG_PRESENT, ctx);
                        break;