bpf: Limit maximum modifier chain length in btf_check_type_tags
Kumar Kartikeya Dwivedi
maintainerPATCH 1/1 bpf: Limit maximum modifier chain length in btf_check_type_tags
On processing a module BTF of module built for an older kernel, we might sometimes find that some type points to itself forming a loop. If such a type is a modifier, btf_check_type_tags's while loop following modifier chain will be caught in an infinite loop.
Fix this by defining a maximum chain length and bailing out if we spin any longer than that.
--- kernel/bpf/btf.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/bpf/btf.c +5 -0
@@ -4815,6 +4815,7 @@ static int btf_check_type_tags(struct btf_verifier_env *env, n =btf_nr_types (btf);for (i = start_id; i < n; i++) {const struct btf_type *t; +int chain_limit =32 ;u32 cur_id = i; t =btf_type_by_id (btf, i);
@@ -4827,6 +4828,10 @@ static int btf_check_type_tags(struct btf_verifier_env *env, in_tags =btf_type_is_type_tag (t);while (btf_type_is_modifier (t)) { +if (!chain_limit--) { +btf_verifier_log (env,"Max chain length or cycle detected" ); +return -ELOOP ; + }if (btf_type_is_type_tag (t)) {if (!in_tags) {btf_verifier_log (env,"Type tags don't precede modifiers" );
--
2.36.1
Quoted 10 lines · Kumar Kartikeya Dwivedi
!-------------------------------------------------------------------|
This Message Is From an External Sender
This message came from outside your organization.
|-------------------------------------------------------------------!On processing a module BTF of module built for an older kernel, we might sometimes find that some type points to itself forming a loop. If such a type is a modifier, btf_check_type_tags's while loop following modifier chain will be caught in an infinite loop.
Quoted 5 lines
Fix this by defining a maximum chain length and bailing out if we spin any longer than that.
Fixes eb596b090558 ("bpf: Ensure type tags precede modifiers in BTF")Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>
This patch was applied to bpf/bpf.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <[email protected]>:
Quoted 9 lines · On Wed, 15 Jun 2022 09:51:51 +0530 you wrote:
On processing a module BTF of module built for an older kernel, we might sometimes find that some type points to itself forming a loop. If such a type is a modifier, btf_check_type_tags's while loop following modifier chain will be caught in an infinite loop.
Fix this by defining a maximum chain length and bailing out if we spin any longer than that.
[...]
Here is the summary with links:
- [bpf] bpf: Limit maximum modifier chain length in btf_check_type_tags
https://git.kernel.org/bpf/bpf/c/d1a374a1aeb7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html