Re: [PATCH bpf-next 2/2] bpf: sanitize BTF data pointer after module is loaded

Re: [PATCH bpf-next 2/2] bpf: sanitize BTF data pointer after module is loaded

[Jessica Yu]

+++ Andrii Nakryiko [19/11/20 10:26 -0800]:
>Given .BTF section is not allocatable, it will get trimmed after module is
>loaded. BPF system handles that properly by creating an independent copy of
>data. But prevent any accidental misused by resetting the pointer to BTF data.
>
>Suggested-by: Jessica Yu <jeyu@kernel.org>
>Fixes: 36e68442d1af ("bpf: Load and verify kernel module BTFs")
>Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

Thanks, Andrii!

Acked-by: Jessica Yu <jeyu@kernel.org>

>---
> kernel/module.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/kernel/module.c b/kernel/module.c
>index f2996b02ab2e..18f259d61d14 100644
>--- a/kernel/module.c
>+++ b/kernel/module.c
>@@ -3709,6 +3709,11 @@ static noinline int do_init_module(struct module *mod)
> 	mod->init_layout.ro_size = 0;
> 	mod->init_layout.ro_after_init_size = 0;
> 	mod->init_layout.text_size = 0;
>+#ifdef CONFIG_DEBUG_INFO_BTF_MODULES
>+	/* .BTF is not SHF_ALLOC and will get removed, so sanitize pointer */
>+	mod->btf_data = NULL;
>+	mod->btf_data_size = 0;
>+#endif
> 	/*
> 	 * We want to free module_init, but be aware that kallsyms may be
> 	 * walking this with preempt disabled.  In all the failure paths, we
>-- 
>2.24.1
>