bpf: disallow attaching modify_return tracing functions to other BPF programs
From the checks and commit messages for modify_return, it seems it was never the intention that it should be possible to attach a tracing program with expected_attach_type == BPF_MODIFY_RETURN to another BPF program. However, check_attach_modify_return() will only look at the function name, so if the target function starts with "security_", the attach will be allowed even for bpf2bpf attachment. Fix this oversight by also blocking the modification if a target program is supplied. Fixes:18644cec71
("bpf: Fix use-after-free in fmod_ret check") Fixes:6ba43b761c
("bpf: Attachment verification for BPF_MODIFY_RETURN") Acked-by: Andrii Nakryiko <andriin@fb.com> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Родитель
84a20d8e87
Коммит
1af9270e90
|
@ -11500,6 +11500,11 @@ static int check_attach_btf_id(struct bpf_verifier_env *env)
|
|||
verbose(env, "%s is not sleepable\n",
|
||||
prog->aux->attach_func_name);
|
||||
} else if (prog->expected_attach_type == BPF_MODIFY_RETURN) {
|
||||
if (tgt_prog) {
|
||||
verbose(env, "can't modify return codes of BPF programs\n");
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
ret = check_attach_modify_return(prog, addr);
|
||||
if (ret)
|
||||
verbose(env, "%s() is not modifiable\n",
|
||||
|
|
Загрузка…
Ссылка в новой задаче