MIPS: bpf: Use correct mask for VLAN_TAG case
authorMarkos Chandras <markos.chandras@imgtec.com>
Mon, 23 Jun 2014 09:38:52 +0000 (10:38 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 26 Jun 2014 09:48:21 +0000 (10:48 +0100)
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>
arch/mips/net/bpf_jit.c

index 500f97fdc0e148b2638ae74666bbf6cf282f46b5..a4d1b76e73731f97f4be96153f995994934a5163 100644 (file)
@@ -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;