netdev - Re: [PATCH net] bpf: don't select potentially stale ri->map from buggy xdp progs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <8adc9e5d-67cb-fa47-a564-166aacd06007@fb.com>
Date:   Thu, 7 Sep 2017 15:37:17 -0700
From:   Alexei Starovoitov <ast@...com>
To:     Daniel Borkmann <daniel@...earbox.net>, <davem@...emloft.net>
CC:     <john.fastabend@...il.com>, <brouer@...hat.com>,
        <andy@...yhouse.net>, <netdev@...r.kernel.org>
Subject: Re: [PATCH net] bpf: don't select potentially stale ri->map from
 buggy xdp progs

On 9/7/17 3:14 PM, Daniel Borkmann wrote:
> Fixes: 97f91a7cf04f ("bpf: add bpf_redirect_map helper routine")
> Reported-by: Jesper Dangaard Brouer <brouer@...hat.com>
> Signed-off-by: Daniel Borkmann <daniel@...earbox.net>
> Signed-off-by: John Fastabend <john.fastabend@...il.com>
> ---
>  kernel/bpf/verifier.c | 16 ++++++++++++++++
>  net/core/filter.c     | 21 +++++++++++++++++++--
>  2 files changed, 35 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index d690c7d..477b693 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -4203,6 +4203,22 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env)
>  			continue;
>  		}
>
> +		if (insn->imm == BPF_FUNC_redirect_map) {
> +			u64 addr = (unsigned long)prog;
> +			struct bpf_insn r4_ld[] = {
> +				BPF_LD_IMM64(BPF_REG_4, addr),
> +				*insn,
> +			};
> +			cnt = ARRAY_SIZE(r4_ld);
> +
> +			new_prog = bpf_patch_insn_data(env, i + delta, r4_ld, cnt);

that's a neat trick.
I think we'll be seeing more of such pattern in the future.
Definitely less intrusive fix than asking drivers or net/core
to clear it.
Acked-by: Alexei Starovoitov <ast@...nel.org>