releases/5.15.17/bpf-adjust-btf-log-size-limit.patch

   1 From 908d35b1ab1bcf3760287e31a8ff8b18d0f04005 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Wed, 1 Dec 2021 10:10:29 -0800
   4 Subject: bpf: Adjust BTF log size limit.
   5
   6 From: Alexei Starovoitov <ast@kernel.org>
   7
   8 [ Upstream commit c5a2d43e998a821701029f23e25b62f9188e93ff ]
   9
  10 Make BTF log size limit to be the same as the verifier log size limit.
  11 Otherwise tools that progressively increase log size and use the same log
  12 for BTF loading and program loading will be hitting hard to debug EINVAL.
  13
  14 Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  15 Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
  16 Link: https://lore.kernel.org/bpf/20211201181040.23337-7-alexei.starovoitov@gmail.com
  17 Signed-off-by: Sasha Levin <sashal@kernel.org>
  18 ---
  19  kernel/bpf/btf.c | 2 +-
  20  1 file changed, 1 insertion(+), 1 deletion(-)
  21
  22 diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
  23 index dfe61df4f974d..79c0bcdcab842 100644
  24 --- a/kernel/bpf/btf.c
  25 +++ b/kernel/bpf/btf.c
  26 @@ -4332,7 +4332,7 @@ static struct btf *btf_parse(bpfptr_t btf_data, u32 btf_data_size,
  27                 log->len_total = log_size;
  28
  29                 /* log attributes have to be sane */
  30 -               if (log->len_total < 128 || log->len_total > UINT_MAX >> 8 ||
  31 +               if (log->len_total < 128 || log->len_total > UINT_MAX >> 2 ||
  32                     !log->level || !log->ubuf) {
  33                         err = -EINVAL;
  34                         goto errout;
  35 --
  36 2.34.1
  37