11 files changed, 18 insertions, 12 deletions

diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index 876060bcceeb..0df5fd561513 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -1047,7 +1047,7 @@ void bpf_jit_compile(struct bpf_prog *fp)
 
         set_memory_ro((unsigned long)header, header->pages);
         fp->bpf_func = (void *)ctx.target;
-        fp->jited = true;
+        fp->jited = 1;
 out:
         kfree(ctx.offsets);
         return;
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index c047598b09e0..a44e5293c6f5 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -744,7 +744,7 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
 
         set_memory_ro((unsigned long)header, header->pages);
         prog->bpf_func = (void *)ctx.image;
-        prog->jited = true;
+        prog->jited = 1;
 out:
         kfree(ctx.offset);
 }
diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 0c4a133f6216..77cb27309db2 100644
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -1251,7 +1251,7 @@ void bpf_jit_compile(struct bpf_prog *fp)
                 bpf_jit_dump(fp->len, alloc_size, 2, ctx.target);
 
         fp->bpf_func = (void *)ctx.target;
-        fp->jited = true;
+        fp->jited = 1;
 
 out:
         kfree(ctx.offsets);
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index 17cea18a09d3..04782164ee67 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -679,7 +679,7 @@ void bpf_jit_compile(struct bpf_prog *fp)
                 ((u64 *)image)[1] = local_paca->kernel_toc;
 #endif
                 fp->bpf_func = (void *)image;
-                fp->jited = true;
+                fp->jited = 1;
         }
 out:
         kfree(addrs);
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index eeda051442c3..9a0c4c22e536 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -1310,7 +1310,7 @@ void bpf_int_jit_compile(struct bpf_prog *fp)
         if (jit.prg_buf) {
                 set_memory_ro((unsigned long)header, header->pages);
                 fp->bpf_func = (void *) jit.prg_buf;
-                fp->jited = true;
+                fp->jited = 1;
         }
 free_addrs:
         kfree(jit.addrs);
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index f8b9f71b9a2b..22564f5f2364 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -812,7 +812,7 @@ cond_branch:			f_offset = addrs[i + filter[i].jf];
         if (image) {
                 bpf_flush_icache(image, image + proglen);
                 fp->bpf_func = (void *)image;
-                fp->jited = true;
+                fp->jited = 1;
         }
 out:
         kfree(addrs);
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 70efcd0940f9..75991979f667 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -1109,7 +1109,7 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
                 bpf_flush_icache(header, image + proglen);
                 set_memory_ro((unsigned long)header, header->pages);
                 prog->bpf_func = (void *)image;
-                prog->jited = true;
+                prog->jited = 1;
         }
 out:
         kfree(addrs);
diff --git a/include/linux/filter.h b/include/linux/filter.h
index fa2cab985e57..bad618f316d7 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -326,8 +326,10 @@ struct bpf_binary_header {
 
 struct bpf_prog {
         u16                     pages;          /* Number of allocated pages */
-        bool                    jited;          /* Is our filter JIT'ed? */
-        bool                    gpl_compatible; /* Is our filter GPL compatible? */
+        kmemcheck_bitfield_begin(meta);
+        u16                     jited:1,        /* Is our filter JIT'ed? */
+                                gpl_compatible:1; /* Is filter GPL compatible? */
+        kmemcheck_bitfield_end(meta);
         u32                     len;            /* Number of filter blocks */
         enum bpf_prog_type      type;           /* Type of BPF program */
         struct bpf_prog_aux     *aux;           /* Auxiliary fields */
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 67c380cfa9ca..c8855c2a7a48 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -82,6 +82,8 @@ struct bpf_prog *bpf_prog_alloc(unsigned int size, gfp_t gfp_extra_flags)
         if (fp == NULL)
                 return NULL;
 
+        kmemcheck_annotate_bitfield(fp, meta);
+
         aux = kzalloc(sizeof(*aux), GFP_KERNEL | gfp_extra_flags);
         if (aux == NULL) {
                 vfree(fp);
@@ -110,6 +112,8 @@ struct bpf_prog *bpf_prog_realloc(struct bpf_prog *fp_old, unsigned int size,
 
         fp = __vmalloc(size, gfp_flags, PAGE_KERNEL);
         if (fp != NULL) {
+                kmemcheck_annotate_bitfield(fp, meta);
+
                 memcpy(fp, fp_old, fp_old->pages * PAGE_SIZE);
                 fp->pages = size / PAGE_SIZE;
 
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 35bac8e8b071..2190ab14b763 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -553,10 +553,10 @@ static int bpf_prog_load(union bpf_attr *attr)
                 goto free_prog;
 
         prog->orig_prog = NULL;
-        prog->jited = false;
+        prog->jited = 0;
 
         atomic_set(&prog->aux->refcnt, 1);
-        prog->gpl_compatible = is_gpl;
+        prog->gpl_compatible = is_gpl ? 1 : 0;
 
         /* find program type: socket_filter vs tracing_filter */
         err = find_prog_type(type, prog);
diff --git a/net/core/filter.c b/net/core/filter.c
index 60e3fe7c59c0..04664acb86ce 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1001,7 +1001,7 @@ static struct bpf_prog *bpf_prepare_filter(struct bpf_prog *fp,
         int err;
 
         fp->bpf_func = NULL;
-        fp->jited = false;
+        fp->jited = 0;
 
         err = bpf_check_classic(fp->insns, fp->len);
         if (err) {