1 files changed, 27 insertions, 8 deletions

diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index c641fb685017..a34f1e214116 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -16,6 +16,7 @@
 #include <linux/netdevice.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/if_vlan.h>
 #include <asm/cacheflush.h>
 #include <asm/hwcap.h>
 
@@ -42,7 +43,7 @@
 #define r_skb_hl        ARM_R8
 
 #define SCRATCH_SP_OFFSET       0
-#define SCRATCH_OFF(k)          (SCRATCH_SP_OFFSET + (k))
+#define SCRATCH_OFF(k)          (SCRATCH_SP_OFFSET + 4 * (k))
 
 #define SEEN_MEM                ((1 << BPF_MEMWORDS) - 1)
 #define SEEN_MEM_WORD(k)        (1 << (k))
@@ -168,6 +169,8 @@ static inline bool is_load_to_a(u16 inst)
         case BPF_S_ANC_MARK:
         case BPF_S_ANC_PROTOCOL:
         case BPF_S_ANC_RXHASH:
+        case BPF_S_ANC_VLAN_TAG:
+        case BPF_S_ANC_VLAN_TAG_PRESENT:
         case BPF_S_ANC_QUEUE:
                 return true;
         default:
@@ -646,6 +649,16 @@ load_ind:
                         update_on_xread(ctx);
                         emit(ARM_ORR_R(r_A, r_A, r_X), ctx);
                         break;
+                case BPF_S_ALU_XOR_K:
+                        /* A ^= K; */
+                        OP_IMM3(ARM_EOR, r_A, r_A, k, ctx);
+                        break;
+                case BPF_S_ANC_ALU_XOR_X:
+                case BPF_S_ALU_XOR_X:
+                        /* A ^= X */
+                        update_on_xread(ctx);
+                        emit(ARM_EOR_R(r_A, r_A, r_X), ctx);
+                        break;
                 case BPF_S_ALU_AND_K:
                         /* A &= K */
                         OP_IMM3(ARM_AND, r_A, r_A, k, ctx);
@@ -762,11 +775,6 @@ b_epilogue:
                         update_on_xread(ctx);
                         emit(ARM_MOV_R(r_A, r_X), ctx);
                         break;
-                case BPF_S_ANC_ALU_XOR_X:
-                        /* A ^= X */
-                        update_on_xread(ctx);
-                        emit(ARM_EOR_R(r_A, r_A, r_X), ctx);
-                        break;
                 case BPF_S_ANC_PROTOCOL:
                         /* A = ntohs(skb->protocol) */
                         ctx->seen |= SEEN_SKB;
@@ -810,6 +818,17 @@ b_epilogue:
                         off = offsetof(struct sk_buff, rxhash);
                         emit(ARM_LDR_I(r_A, r_skb, off), ctx);
                         break;
+                case BPF_S_ANC_VLAN_TAG:
+                case BPF_S_ANC_VLAN_TAG_PRESENT:
+                        ctx->seen |= SEEN_SKB;
+                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_tci) != 2);
+                        off = offsetof(struct sk_buff, vlan_tci);
+                        emit(ARM_LDRH_I(r_A, r_skb, off), ctx);
+                        if (inst->code == BPF_S_ANC_VLAN_TAG)
+                                OP_IMM3(ARM_AND, r_A, r_A, VLAN_VID_MASK, ctx);
+                        else
+                                OP_IMM3(ARM_AND, r_A, r_A, VLAN_TAG_PRESENT, ctx);
+                        break;
                 case BPF_S_ANC_QUEUE:
                         ctx->seen |= SEEN_SKB;
                         BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,
@@ -845,7 +864,7 @@ void bpf_jit_compile(struct sk_filter *fp)
         ctx.skf         = fp;
         ctx.ret0_fp_idx = -1;
 
-        ctx.offsets = kzalloc(GFP_KERNEL, 4 * (ctx.skf->len + 1));
+        ctx.offsets = kzalloc(4 * (ctx.skf->len + 1), GFP_KERNEL);
         if (ctx.offsets == NULL)
                 return;
 
@@ -864,7 +883,7 @@ void bpf_jit_compile(struct sk_filter *fp)
 
         ctx.idx += ctx.imm_count;
         if (ctx.imm_count) {
-                ctx.imms = kzalloc(GFP_KERNEL, 4 * ctx.imm_count);
+                ctx.imms = kzalloc(4 * ctx.imm_count, GFP_KERNEL);
                 if (ctx.imms == NULL)
                         goto out;
         }