MIPS: bpf: Use 'andi' instead of 'and' for the VLAN cases

The VLAN_VID_MASK and VLAN_TAG_PRESENT are immediates, so using
'and' which expects 3 registers will produce wrong results. Fix
this by using the 'andi' instruction.

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/7124/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 95728ea6cb74355c232905ed79f64385b0049dd0..fe5041bdc6fb2b9304f3ee9eda5819cdf25c09c9 100644 (file)
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -1317,9 +1317,9 @@ 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_and(r_A, r_s0, VLAN_VID_MASK, ctx);
+                               emit_andi(r_A, r_s0, VLAN_VID_MASK, ctx);
                        else
-                               emit_and(r_A, r_s0, VLAN_TAG_PRESENT, ctx);
+                               emit_andi(r_A, r_s0, VLAN_TAG_PRESENT, ctx);
                        break;
                case BPF_ANC | SKF_AD_PKTTYPE:
                        off = pkt_type_offset();