summaryrefslogtreecommitdiffstats
path: root/arch/mips/net
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2014-06-23 10:38:52 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-06-26 10:48:21 +0100
commit6e86c59d4d0d04e7ebefd05b8af245c968892f81 (patch)
tree1e144d5ff5a30b65ac01ee146bbcd444e1137741 /arch/mips/net
parent1ab24a4e3de1ec37d8ed255841d2d94d77e8a4f4 (diff)
downloadop-kernel-dev-6e86c59d4d0d04e7ebefd05b8af245c968892f81.zip
op-kernel-dev-6e86c59d4d0d04e7ebefd05b8af245c968892f81.tar.gz
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 <markos.chandras@imgtec.com> Cc: David S. Miller <davem@davemloft.net> Cc: Daniel Borkmann <dborkman@redhat.com> Cc: Alexei Starovoitov <ast@plumgrid.com> Cc: netdev@vger.kernel.org Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/7127/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/net')
-rw-r--r--arch/mips/net/bpf_jit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 500f97f..a4d1b76 100644
--- 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;
OpenPOWER on IntegriCloud