Received-SPF: pass (google.com: domain of linux-kernel+bounces-122083-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240326003832.102750-1-cam.alvarez.i@gmail.com>
In-Reply-To: <20240326003832.102750-1-cam.alvarez.i@gmail.com>
From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Date: Wed, 27 Mar 2024 15:14:53 -0700
Message-ID: <CAADnVQLfo0m+j6g03epR5Or46AycWbFb7yER2R9RNCT6-6Tx1A@mail.gmail.com>
Subject: Re: [PATCH] fix array-index-out-of-bounds in bpf_prog_select_runtime
To: Camila Alvarez <cam.alvarez.i@gmail.com>
Cc: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, bpf <bpf@vger.kernel.org>, 
	LKML <linux-kernel@vger.kernel.org>, 
	syzbot+d2a2c639d03ac200a4f1@syzkaller.appspotmail.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Mar 25, 2024 at 5:41=E2=80=AFPM Camila Alvarez <cam.alvarez.i@gmail=
com> wrote:
>
> BPF documentation specifies that the maximum stack depth for a BPF
> program is 512 bytes. This is not enforced when selecting a bpf
> interpreter, thus casuing an index out of bounds error when trying to
> obtain an interpreter with a bigger stack size.
>
> This patch enforces the stack size to be not bigger than
> 512.
>
> Reported-by: syzbot+d2a2c639d03ac200a4f1@syzkaller.appspotmail.com
> Signed-off-by: Camila Alvarez <cam.alvarez.i@gmail.com>
> ---
>  kernel/bpf/core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
> index 696bc55de8e8..8167b3a721e9 100644
> --- a/kernel/bpf/core.c
> +++ b/kernel/bpf/core.c
> @@ -2196,7 +2196,7 @@ static u64 ___bpf_prog_run(u64 *regs, const struct =
bpf_insn *insn)
>                 BUG_ON(1);
>                 return 0;
>  }
> -
> +#define BPF_MAX_STACK_SIZE 512
>  #define PROG_NAME(stack_size) __bpf_prog_run##stack_size
>  #define DEFINE_BPF_PROG_RUN(stack_size) \
>  static unsigned int PROG_NAME(stack_size)(const void *ctx, const struct =
bpf_insn *insn) \
> @@ -2345,7 +2345,7 @@ static void bpf_prog_select_func(struct bpf_prog *f=
p)
>  {
>  #ifndef CONFIG_BPF_JIT_ALWAYS_ON
>         u32 stack_depth =3D max_t(u32, fp->aux->stack_depth, 1);
> -
> +       stack_depth =3D min_t(u32, stack_depth, BPF_MAX_STACK_SIZE);
>         fp->bpf_func =3D interpreters[(round_up(stack_depth, 32) / 32) - =
1];

That's not the root cause of the issue.
syzbot is saying: index 16 is out of range for type '<unknown> *[16]'

somehow stack depth got bigger than 512.
The bug is somewhere in the verifier.
Please debug it further.