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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 2832CC3A5A8 for ; Wed, 4 Sep 2019 16:08:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F10B521883 for ; Wed, 4 Sep 2019 16:08:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567613328; bh=a8PcxwkH/yhBpP/Uv+e/tOJ3RH9mLDf+5boZSmLhLN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n4u2LDNR44hLmI/FWKKMfMnujWKoNa4nL1fXO4yHL8QYsXSU0mimXCh18+j76Lv78 yku3YghrL9UUkSUV1bj7toeMYCcSAsgxIs4+TIhEaHoSJb6QjIw8pRYEIyeQRyFoBM rPDD7O+7ayBOZGaTzPHpiqy4t96toRuEdSLcOnKo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732542AbfIDQIq (ORCPT ); Wed, 4 Sep 2019 12:08:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:36788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732993AbfIDQB0 (ORCPT ); Wed, 4 Sep 2019 12:01:26 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 54B8D2087E; Wed, 4 Sep 2019 16:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612885; bh=a8PcxwkH/yhBpP/Uv+e/tOJ3RH9mLDf+5boZSmLhLN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=okqARay8H2nsbBKacGy0U/xcf3HSj4FDjYM1c8Gu+gLBGJ8XmU+HqcPQ6H7L2D7y6 WYxAE2YOYbbSidIJXwg7rzcMLZjrQDyRNh9MJnu5svW9mmvzd+HG24ZcZKDjS8fcoL MCh5Jy6Zmc5CfSkXWb0f9036OgSibcStrPx4cTDI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ilya Leoshkevich , Vasily Gorbik , Daniel Borkmann , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 02/36] s390/bpf: fix lcgr instruction encoding Date: Wed, 4 Sep 2019 12:00:48 -0400 Message-Id: <20190904160122.4179-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904160122.4179-1-sashal@kernel.org> References: <20190904160122.4179-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 bc9431aace05d..fcb9e840727cd 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -882,7 +882,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