]> git.karo-electronics.de Git - linux-beck.git/commitdiff
powerpc: bpf: Fix the broken LD_VLAN_TAG_PRESENT test
authorDenis Kirjanov <kda@linux-powerpc.org>
Wed, 25 Jun 2014 17:34:57 +0000 (21:34 +0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Jun 2014 23:14:12 +0000 (16:14 -0700)
We have to return the boolean here if the tag presents
or not, not just ANDing the TCI with the mask which results to:

[  709.412097] test_bpf: #18 LD_VLAN_TAG_PRESENT
[  709.412245] ret 4096 != 1
[  709.412332] ret 4096 != 1
[  709.412333] FAIL (2 times)

Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/powerpc/net/bpf_jit_comp.c

index 892167b0a4bc991cb39979688a993e1f849ab88d..82e82cadcde56589361ce04c98d554bcf4faec7d 100644 (file)
@@ -394,10 +394,12 @@ static int bpf_jit_build_body(struct sk_filter *fp, u32 *image,
 
                        PPC_LHZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,
                                                          vlan_tci));
-                       if (code == (BPF_ANC | SKF_AD_VLAN_TAG))
+                       if (code == (BPF_ANC | SKF_AD_VLAN_TAG)) {
                                PPC_ANDI(r_A, r_A, ~VLAN_TAG_PRESENT);
-                       else
+                       } else {
                                PPC_ANDI(r_A, r_A, VLAN_TAG_PRESENT);
+                               PPC_SRWI(r_A, r_A, 12);
+                       }
                        break;
                case BPF_ANC | SKF_AD_QUEUE:
                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,