Merge tag 'tegra-for-3.17-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...

[cascardo/linux.git] / lib / test_bpf.c

diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index f8d2b2a..c579e0f 100644 (file)
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -157,6 +157,18 @@ static struct bpf_test tests[] = {
                { },
                { { 0, 0x800000ff }, { 1, 0x800000ff } },
        },
+       {
+               "LD_IMM_0",
+               .u.insns = {
+                       BPF_STMT(BPF_LD | BPF_IMM, 0), /* ld #0 */
+                       BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, 0, 1, 0),
+                       BPF_STMT(BPF_RET | BPF_K, 0),
+                       BPF_STMT(BPF_RET | BPF_K, 1),
+               },
+               CLASSIC,
+               { },
+               { { 1, 1 } },
+       },
        {
                "LD_IND",
                .u.insns = {
@@ -373,7 +385,7 @@ static struct bpf_test tests[] = {
        {
                "LD_NLATTR",
                .u.insns = {
-                       BPF_STMT(BPF_LDX | BPF_IMM, 1),
+                       BPF_STMT(BPF_LDX | BPF_IMM, 2),
                        BPF_STMT(BPF_MISC | BPF_TXA, 0),
                        BPF_STMT(BPF_LDX | BPF_IMM, 3),
                        BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
@@ -381,42 +393,50 @@ static struct bpf_test tests[] = {
                        BPF_STMT(BPF_RET | BPF_A, 0)
                },
                CLASSIC,
-               { 0xff, 4, 0, 2, 0, 4, 0, 3, 0 },
-               { { 4, 0 }, { 20, 5 } },
+#ifdef __BIG_ENDIAN
+               { 0xff, 0xff, 0, 4, 0, 2, 0, 4, 0, 3 },
+#else
+               { 0xff, 0xff, 4, 0, 2, 0, 4, 0, 3, 0 },
+#endif
+               { { 4, 0 }, { 20, 6 } },
        },
        {
                "LD_NLATTR_NEST",
                .u.insns = {
-                       BPF_STMT(BPF_LD | BPF_IMM, 1),
+                       BPF_STMT(BPF_LD | BPF_IMM, 2),
                        BPF_STMT(BPF_LDX | BPF_IMM, 3),
                        BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                 SKF_AD_OFF + SKF_AD_NLATTR_NEST),
-                       BPF_STMT(BPF_LD | BPF_IMM, 1),
+                       BPF_STMT(BPF_LD | BPF_IMM, 2),
                        BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                 SKF_AD_OFF + SKF_AD_NLATTR_NEST),
-                       BPF_STMT(BPF_LD | BPF_IMM, 1),
+                       BPF_STMT(BPF_LD | BPF_IMM, 2),
                        BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                 SKF_AD_OFF + SKF_AD_NLATTR_NEST),
-                       BPF_STMT(BPF_LD | BPF_IMM, 1),
+                       BPF_STMT(BPF_LD | BPF_IMM, 2),
                        BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                 SKF_AD_OFF + SKF_AD_NLATTR_NEST),
-                       BPF_STMT(BPF_LD | BPF_IMM, 1),
+                       BPF_STMT(BPF_LD | BPF_IMM, 2),
                        BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                 SKF_AD_OFF + SKF_AD_NLATTR_NEST),
-                       BPF_STMT(BPF_LD | BPF_IMM, 1),
+                       BPF_STMT(BPF_LD | BPF_IMM, 2),
                        BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                 SKF_AD_OFF + SKF_AD_NLATTR_NEST),
-                       BPF_STMT(BPF_LD | BPF_IMM, 1),
+                       BPF_STMT(BPF_LD | BPF_IMM, 2),
                        BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                 SKF_AD_OFF + SKF_AD_NLATTR_NEST),
-                       BPF_STMT(BPF_LD | BPF_IMM, 1),
+                       BPF_STMT(BPF_LD | BPF_IMM, 2),
                        BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
                                 SKF_AD_OFF + SKF_AD_NLATTR_NEST),
                        BPF_STMT(BPF_RET | BPF_A, 0)
                },
                CLASSIC,
-               { 0xff, 12, 0, 1, 0, 4, 0, 2, 0, 4, 0, 3, 0 },
-               { { 4, 0 }, { 20, 9 } },
+#ifdef __BIG_ENDIAN
+               { 0xff, 0xff, 0, 12, 0, 1, 0, 4, 0, 2, 0, 4, 0, 3 },
+#else
+               { 0xff, 0xff, 12, 0, 1, 0, 4, 0, 2, 0, 4, 0, 3, 0 },
+#endif
+               { { 4, 0 }, { 20, 10 } },
        },
        {
                "LD_PAYLOAD_OFF",
@@ -1734,12 +1754,11 @@ static int probe_filter_length(struct sock_filter *fp)
 {
        int len = 0;
 
-       while (fp->code != 0 || fp->k != 0) {
-               fp++;
-               len++;
-       }
+       for (len = MAX_INSNS - 1; len > 0; --len)
+               if (fp[len].code != 0 || fp[len].k != 0)
+                       break;
 
-       return len;
+       return len + 1;
 }
 
 static struct sk_filter *generate_filter(int which, int *err)