netdev - Re: pull-request: bpf-next 2019-12-27

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: <CAJ+HfNhW=tWdAD0jUyNCE7+Hby6874JAr8bfJHnc+edFLQExRg@mail.gmail.com>
Date:   Fri, 27 Dec 2019 20:07:33 +0100
From:   Björn Töpel <bjorn.topel@...il.com>
To:     Daniel Borkmann <daniel@...earbox.net>
Cc:     David Miller <davem@...emloft.net>,
        Jakub Kicinski <jakub.kicinski@...ronome.com>,
        Alexei Starovoitov <ast@...nel.org>,
        Netdev <netdev@...r.kernel.org>, bpf <bpf@...r.kernel.org>
Subject: Re: pull-request: bpf-next 2019-12-27

On Fri, 27 Dec 2019 at 19:08, Daniel Borkmann <daniel@...earbox.net> wrote:
>
[...]
>
> 2) Merge conflict in arch/riscv/net/bpf_jit_comp.c:
>
> (I'm keeping Bjorn in Cc here for a double-check in case I got it wrong.)
>
>   <<<<<<< HEAD
>           if (is_13b_check(off, insn))
>                   return -1;
>           emit(rv_blt(tcc, RV_REG_ZERO, off >> 1), ctx);
>   =======
>           emit_branch(BPF_JSLT, RV_REG_T1, RV_REG_ZERO, off, ctx);
>   >>>>>>> 7c8dce4b166113743adad131b5a24c4acc12f92c
>
> Result should look like:
>
>           emit_branch(BPF_JSLT, tcc, RV_REG_ZERO, off, ctx);
>

That's correct. Thanks, Daniel, for the fixup (over the holiday)!


Happy holidays,
Björn