| Message ID | 20230917153846.88732-1-hffilwlqm@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b724a6418f1f853bcb39c8923bf14a50c7bdbd07 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf,v2] bpf: Fix tr dereferencing | expand |
Hello: This patch was applied to bpf/bpf.git (master) by Andrii Nakryiko <andrii@kernel.org>: On Sun, 17 Sep 2023 23:38:46 +0800 you wrote: > Fix 'tr' dereferencing bug when CONFIG_BPF_JIT is turned off. > > When CONFIG_BPF_JIT is turned off, 'bpf_trampoline_get()' returns NULL, > which is same as the cases when CONFIG_BPF_JIT is turned on. > > v1->v2: > * Comments from Alexei: > * Return NULL in that case. > > [...] Here is the summary with links: - [bpf,v2] bpf: Fix tr dereferencing https://git.kernel.org/bpf/bpf/c/b724a6418f1f You are awesome, thank you!
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 024e8b28c34b8..49f8b691496c4 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1307,7 +1307,7 @@ static inline int bpf_trampoline_unlink_prog(struct bpf_tramp_link *link, static inline struct bpf_trampoline *bpf_trampoline_get(u64 key, struct bpf_attach_target_info *tgt_info) { - return ERR_PTR(-EOPNOTSUPP); + return NULL; } static inline void bpf_trampoline_put(struct bpf_trampoline *tr) {} #define DEFINE_BPF_DISPATCHER(name)
Fix 'tr' dereferencing bug when CONFIG_BPF_JIT is turned off. When CONFIG_BPF_JIT is turned off, 'bpf_trampoline_get()' returns NULL, which is same as the cases when CONFIG_BPF_JIT is turned on. v1->v2: * Comments from Alexei: * Return NULL in that case. Fixes: f7b12b6fea00 ("bpf: verifier: refactor check_attach_btf_id()") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/r/202309131936.5Nc8eUD0-lkp@intel.com/ Signed-off-by: Leon Hwang <hffilwlqm@gmail.com> --- include/linux/bpf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)