Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 842E15679 for ; Thu, 13 Jul 2023 06:08:03 +0000 (UTC) Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8089119B9 for ; Wed, 12 Jul 2023 23:08:02 -0700 (PDT) Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36CN0dcc019856 for ; Wed, 12 Jul 2023 23:08:02 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=Eyaq+Z87TSgWCJBZkFcX9avbH6w5HUWJu+t3wiC6N6c=; b=M9TwVdSd5chrVmPSoMynMflg/vIzrQgpnxGyBmMSx3O6FOoy7zbN+Jw4P4+Q/47a+TUn Rtkr8AYtGDtjd2lfHkskb4OCUsww5DMjvUPjqoB6/9lpM0MAHcuuLCk1u9aFXBt7ht1F Fw67vQavikCb1T7U8Vi60UdnBQ41aNsD0WE= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3rt5fc254m-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 12 Jul 2023 23:08:02 -0700 Received: from twshared35445.38.frc1.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Wed, 12 Jul 2023 23:08:01 -0700 Received: by devbig309.ftw3.facebook.com (Postfix, from userid 128203) id D8D5322EFA2CF; Wed, 12 Jul 2023 23:07:49 -0700 (PDT) From: Yonghong Song To: CC: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Fangrui Song , Subject: [PATCH bpf-next v2 06/15] bpf: Fix jit blinding with new sdiv/smov insns Date: Wed, 12 Jul 2023 23:07:49 -0700 Message-ID: <20230713060749.391061-1-yhs@fb.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230713060718.388258-1-yhs@fb.com> References: <20230713060718.388258-1-yhs@fb.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: 50X7Om3cheTWGKHHQOf0qK9z7SEV9haG X-Proofpoint-GUID: 50X7Om3cheTWGKHHQOf0qK9z7SEV9haG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-13_03,2023-07-11_01,2023-05-22_02 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Handle new insns properly in bpf_jit_blind_insn() function. Signed-off-by: Yonghong Song --- include/linux/filter.h | 14 ++++++++++---- kernel/bpf/core.c | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index f69114083ec7..7a0144d66dfb 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -90,22 +90,28 @@ struct ctl_table_header; =20 /* ALU ops on registers, bpf_add|sub|...: dst_reg +=3D src_reg */ =20 -#define BPF_ALU64_REG(OP, DST, SRC) \ +#define BPF_ALU64_REG_OFF(OP, DST, SRC, OFF) \ ((struct bpf_insn) { \ .code =3D BPF_ALU64 | BPF_OP(OP) | BPF_X, \ .dst_reg =3D DST, \ .src_reg =3D SRC, \ - .off =3D 0, \ + .off =3D OFF, \ .imm =3D 0 }) =20 -#define BPF_ALU32_REG(OP, DST, SRC) \ +#define BPF_ALU64_REG(OP, DST, SRC) \ + BPF_ALU64_REG_OFF(OP, DST, SRC, 0) + +#define BPF_ALU32_REG_OFF(OP, DST, SRC, OFF) \ ((struct bpf_insn) { \ .code =3D BPF_ALU | BPF_OP(OP) | BPF_X, \ .dst_reg =3D DST, \ .src_reg =3D SRC, \ - .off =3D 0, \ + .off =3D OFF, \ .imm =3D 0 }) =20 +#define BPF_ALU32_REG(OP, DST, SRC) \ + BPF_ALU32_REG_OFF(OP, DST, SRC, 0) + /* ALU ops on immediates, bpf_add|sub|...: dst_reg +=3D imm32 */ =20 #define BPF_ALU64_IMM(OP, DST, IMM) \ diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 6f7134657935..c75391ac575e 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -1272,7 +1272,7 @@ static int bpf_jit_blind_insn(const struct bpf_insn= *from, case BPF_ALU | BPF_MOD | BPF_K: *to++ =3D BPF_ALU32_IMM(BPF_MOV, BPF_REG_AX, imm_rnd ^ from->imm); *to++ =3D BPF_ALU32_IMM(BPF_XOR, BPF_REG_AX, imm_rnd); - *to++ =3D BPF_ALU32_REG(from->code, from->dst_reg, BPF_REG_AX); + *to++ =3D BPF_ALU32_REG_OFF(from->code, from->dst_reg, BPF_REG_AX, fro= m->off); break; =20 case BPF_ALU64 | BPF_ADD | BPF_K: @@ -1286,7 +1286,7 @@ static int bpf_jit_blind_insn(const struct bpf_insn= *from, case BPF_ALU64 | BPF_MOD | BPF_K: *to++ =3D BPF_ALU64_IMM(BPF_MOV, BPF_REG_AX, imm_rnd ^ from->imm); *to++ =3D BPF_ALU64_IMM(BPF_XOR, BPF_REG_AX, imm_rnd); - *to++ =3D BPF_ALU64_REG(from->code, from->dst_reg, BPF_REG_AX); + *to++ =3D BPF_ALU64_REG_OFF(from->code, from->dst_reg, BPF_REG_AX, fro= m->off); break; =20 case BPF_JMP | BPF_JEQ | BPF_K: --=20 2.34.1