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,USER_AGENT_GIT autolearn=unavailable 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 08769C28CBC for ; Thu, 30 Apr 2020 14:04:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB0F9206D9 for ; Thu, 30 Apr 2020 14:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588255448; bh=/Wqjtp4C2KTUJ7aU52LARgn34AvNvr/qfNFE2J64GG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=otZ1v8qDuPlBd/pdZEztnRCYgzNCTestH8Q9IhJHfK/fbdsPBK3cLxQ++Snvn2gc0 nL5nPIuvWUZ2VznUdBkGNzrfuf53OLtDsTO0IYfuKtlhFDnWw/KUtRIQsxREBIXMd3 BD/m73M7XdnyZTfzeA3eJUxnrx7MEEZHA0gfnNZA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729488AbgD3OEG (ORCPT ); Thu, 30 Apr 2020 10:04:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:35108 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728703AbgD3NxX (ORCPT ); Thu, 30 Apr 2020 09:53:23 -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 58E0424953; Thu, 30 Apr 2020 13:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254803; bh=/Wqjtp4C2KTUJ7aU52LARgn34AvNvr/qfNFE2J64GG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HPQpQ2or9zsiFTNLtkkSH6AvsaT4qHhQPY7833e570b2+4zW9T966B9dJLRkT0AeP WVLwBTNYXTObrEcL8GZXJKtNATfrbCi0ryZMRf94eAN9UuA4yrsDA7afI4pxzw/bSS hy9ACSpATRE13u+52isy2ZD1q9gWTwf9HfxGAbRM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wang YanQing , Alexei Starovoitov , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 57/57] bpf, x86_32: Fix logic error in BPF_LDX zero-extension Date: Thu, 30 Apr 2020 09:52:18 -0400 Message-Id: <20200430135218.20372-57-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135218.20372-1-sashal@kernel.org> References: <20200430135218.20372-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: Wang YanQing [ Upstream commit 5ca1ca01fae1e90f8d010eb1d83374f28dc11ee6 ] When verifier_zext is true, we don't need to emit code for zero-extension. Fixes: 836256bf5f37 ("x32: bpf: eliminate zero extension code-gen") Signed-off-by: Wang YanQing Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20200423050637.GA4029@udknight Signed-off-by: Sasha Levin --- arch/x86/net/bpf_jit_comp32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c index ba7d9ccfc6626..66cd150b7e541 100644 --- a/arch/x86/net/bpf_jit_comp32.c +++ b/arch/x86/net/bpf_jit_comp32.c @@ -1847,7 +1847,7 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, case BPF_B: case BPF_H: case BPF_W: - if (!bpf_prog->aux->verifier_zext) + if (bpf_prog->aux->verifier_zext) break; if (dstk) { EMIT3(0xC7, add_1reg(0x40, IA32_EBP), -- 2.20.1