From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CDC8C3A5A6 for ; Thu, 19 Sep 2019 22:08:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 049D521928 for ; Thu, 19 Sep 2019 22:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568930898; bh=YGUky5l4b/jTQwvCUKgf0yLafhrXcctKofNMlj9R7Ao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1SdkiVd5HjgcShgm7uSpxmF8zB0eohLBC7kaIeH4NXzzLnEsVZlXB3BJKlr6dyeKQ sIxfdd6zlPMgTG8JIrMCSz7fUVSFgCGOioQshmgaXMfsnHJKcMXvdKfUJnmnXyikhe DGDpBDd9GNQ7iXEGZUjddQd6+0MxzNafLym9vLf4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393380AbfISWIQ (ORCPT ); Thu, 19 Sep 2019 18:08:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:46142 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393369AbfISWIQ (ORCPT ); Thu, 19 Sep 2019 18:08:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 62225218AF; Thu, 19 Sep 2019 22:08:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568930894; bh=YGUky5l4b/jTQwvCUKgf0yLafhrXcctKofNMlj9R7Ao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gENUcj9LB1VQbGdpoY2RT4k0vgcXDIeyJBNc1P3PHs7N/eGqM6uqyBJkjBxPAbSp3 s9VDCsukmGFARzqegasoY1+wCEh5kTc0h+SNsirvGo/v1ugZr7w9dGkkueFrqEjyby 0lTvxN4wB0bDvbyvUTMO7jFtTCBMNedU2ax/EHgU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Leoshkevich , Vasily Gorbik , Daniel Borkmann , Sasha Levin Subject: [PATCH 5.2 036/124] s390/bpf: fix lcgr instruction encoding Date: Fri, 20 Sep 2019 00:02:04 +0200 Message-Id: <20190919214820.329463470@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214819.198419517@linuxfoundation.org> References: <20190919214819.198419517@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ilya Leoshkevich [ Upstream commit bb2d267c448f4bc3a3389d97c56391cb779178ae ] "masking, test in bounds 3" fails on s390, because BPF_ALU64_IMM(BPF_NEG, BPF_REG_2, 0) ignores the top 32 bits of BPF_REG_2. The reason is that JIT emits lcgfr instead of lcgr. The associated comment indicates that the code was intended to emit lcgr in the first place, it's just that the wrong opcode was used. Fix by using the correct opcode. Fixes: 054623105728 ("s390/bpf: Add s390x eBPF JIT compiler backend") Signed-off-by: Ilya Leoshkevich Acked-by: Vasily Gorbik Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- arch/s390/net/bpf_jit_comp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 5e7c630331590..9a711472cbdc0 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -853,7 +853,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i break; case BPF_ALU64 | BPF_NEG: /* dst = -dst */ /* lcgr %dst,%dst */ - EMIT4(0xb9130000, dst_reg, dst_reg); + EMIT4(0xb9030000, dst_reg, dst_reg); break; /* * BPF_FROM_BE/LE -- 2.20.1