Re: [PATCH bpf-next v2 1/2] bpf: Fail verification for sign-extension of packet data/data_end/data_meta

[Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx>]

On Wed, Jul 17, 2024 at 10:02 PM Yonghong Song <yonghong.song@xxxxxxxxx> wrote:
>
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index 8da132a1ef28..3a04eab7a962 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -5587,11 +5587,12 @@ static int check_packet_access(struct bpf_verifier_env *env, u32 regno, int off,
>  /* check access to 'struct bpf_context' fields.  Supports fixed offsets only */
>  static int check_ctx_access(struct bpf_verifier_env *env, int insn_idx, int off, int size,
>                             enum bpf_access_type t, enum bpf_reg_type *reg_type,
> -                           struct btf **btf, u32 *btf_id)
> +                           struct btf **btf, u32 *btf_id, bool is_ldsx)

There is a conflict now:
  static int check_ctx_access(struct bpf_verifier_env *env, int
insn_idx, int off, int size,
                            enum bpf_access_type t, enum bpf_reg_type *reg_type,
++<<<<<<< HEAD
 +                          struct btf **btf, u32 *btf_id, bool *is_retval)
++=======
+                           struct btf **btf, u32 *btf_id, bool is_ldsx)
++>>>>>>> bpf: Fail verification for sign-extension of packet
data/data_end/data_meta

Pls respin.

pw-bot: cr