bpf: Fill new bpf_prog_pack with illegal instructions

bpf_prog_pack enables sharing huge pages among multiple BPF programs.
These pages are marked as executable before the JIT engine fill it with
BPF programs. To make these pages safe, fill the hole bpf_prog_pack with
illegal instructions before making it executable.

Fixes: 0a066f82325a ("bpf: Introduce bpf_prog_pack allocator")
Fixes: d69eaf2dbc24 ("bpf: Introduce bpf_jit_binary_pack_[alloc|finalize|free]")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Song Liu <song@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220520235758.1858153-2-song@kernel.org

diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 9cc91f0f3115a49e00436a85ad7a3009bb5ef807..2d0c9d4696ad6c95bec3253b40fca75d9af16944 100644 (file)
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -873,7 +873,7 @@ static size_t select_bpf_prog_pack_size(void)
        return size;
 }
 
-static struct bpf_prog_pack *alloc_new_pack(void)
+static struct bpf_prog_pack *alloc_new_pack(bpf_jit_fill_hole_t bpf_fill_ill_insns)
 {
        struct bpf_prog_pack *pack;
 
@@ -886,6 +886,7 @@ static struct bpf_prog_pack *alloc_new_pack(void)
                kfree(pack);
                return NULL;
        }
+       bpf_fill_ill_insns(pack->ptr, bpf_prog_pack_size);
        bitmap_zero(pack->bitmap, bpf_prog_pack_size / BPF_PROG_CHUNK_SIZE);
        list_add_tail(&pack->list, &pack_list);
 
@@ -895,7 +896,7 @@ static struct bpf_prog_pack *alloc_new_pack(void)
        return pack;
 }
 
-static void *bpf_prog_pack_alloc(u32 size)
+static void *bpf_prog_pack_alloc(u32 size, bpf_jit_fill_hole_t bpf_fill_ill_insns)
 {
        unsigned int nbits = BPF_PROG_SIZE_TO_NBITS(size);
        struct bpf_prog_pack *pack;
@@ -910,6 +911,7 @@ static void *bpf_prog_pack_alloc(u32 size)
                size = round_up(size, PAGE_SIZE);
                ptr = module_alloc(size);
                if (ptr) {
+                       bpf_fill_ill_insns(ptr, size);
                        set_vm_flush_reset_perms(ptr);
                        set_memory_ro((unsigned long)ptr, size / PAGE_SIZE);
                        set_memory_x((unsigned long)ptr, size / PAGE_SIZE);
@@ -923,7 +925,7 @@ static void *bpf_prog_pack_alloc(u32 size)
                        goto found_free_area;
        }
 
-       pack = alloc_new_pack();
+       pack = alloc_new_pack(bpf_fill_ill_insns);
        if (!pack)
                goto out;
 
@@ -1102,7 +1104,7 @@ bpf_jit_binary_pack_alloc(unsigned int proglen, u8 **image_ptr,
 
        if (bpf_jit_charge_modmem(size))
                return NULL;
-       ro_header = bpf_prog_pack_alloc(size);
+       ro_header = bpf_prog_pack_alloc(size, bpf_fill_ill_insns);
        if (!ro_header) {
                bpf_jit_uncharge_modmem(size);
                return NULL;