lkml.org 
[lkml]   [2021]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 133/151] powerpc/bpf: Fix BPF_MOD when imm == 1
    Date
    From: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>

    [ Upstream commit 8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8 ]

    Only ignore the operation if dividing by 1.

    Fixes: 156d0e290e969c ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF")
    Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
    Tested-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
    Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    Acked-by: Song Liu <songliubraving@fb.com>
    Acked-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/c674ca18c3046885602caebb326213731c675d06.1633464148.git.naveen.n.rao@linux.vnet.ibm.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/net/bpf_jit_comp64.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c
    index b87a63dba9c8..d16b97179646 100644
    --- a/arch/powerpc/net/bpf_jit_comp64.c
    +++ b/arch/powerpc/net/bpf_jit_comp64.c
    @@ -389,8 +389,14 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *
    case BPF_ALU64 | BPF_DIV | BPF_K: /* dst /= imm */
    if (imm == 0)
    return -EINVAL;
    - else if (imm == 1)
    - goto bpf_alu32_trunc;
    + if (imm == 1) {
    + if (BPF_OP(code) == BPF_DIV) {
    + goto bpf_alu32_trunc;
    + } else {
    + EMIT(PPC_RAW_LI(dst_reg, 0));
    + break;
    + }
    + }

    PPC_LI32(b2p[TMP_REG_1], imm);
    switch (BPF_CLASS(code)) {
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-10-11 16:37    [W:5.346 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site