Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1882845ybz; Thu, 30 Apr 2020 07:10:23 -0700 (PDT) X-Google-Smtp-Source: APiQypLfQl7Zch6LUjU0vcod7KLewsbnQqgdIMtVx9mIPRc9zYwJb1QophRvTJUVrYPDKQm8sL+M X-Received: by 2002:aa7:d455:: with SMTP id q21mr2812694edr.235.1588255823600; Thu, 30 Apr 2020 07:10:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588255823; cv=none; d=google.com; s=arc-20160816; b=JXWL3s/RrlORB67z9g1RgSxqJK1P0p4Qs1/rXp0EbPAVhaFVfDBLF44oRF9UTTL8Oy +AN2Wki6XEzkC8Zx5DghQEcZnyZVAEoGF/hhU/fRiPsRthST2HIQ7h2CPEDgxU5LDZY/ NC6Li7t864a9TgHWWbcQJY6f+lAIDJzDISlQY2BAGfkvYre04G2xAay/WUWuMPmwRXl5 pArnlsW08+ctvbOKuDrUMqd3eMg2kXvmWB9po/YiX/uLGKhUmaVh9iXWUNxBa7oUVD4j WxyAghpeUL8y3zFpZ6A9iUkCmfcr35EZtQx/GOJlptpoQCIhnBE0Xyzm1i2GbBm0b3vr uSNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6dHReLO0a225PaazzdQTNsTPKBGUY0R3G6Uo9z4nrKM=; b=z6bQqFMz+4CgIo9A3HZvymRG0e4wk4JWzeQeRQhQkvkA8ygVR7R7uPuGapOlhM8rNt o7mOOIz+re4n/zZlhgqYV0/gBBEPffDvPvM3dCSGYD1FkoXGU5j3liojO2aOiG54TdQh VLsMP7PyxNVrNNZ9T+zZDGNzm0a8T+FZAf3sintKdxjxGPTeo5Y0hyXzO7X/R/8bdpW5 TURxnQeC8NZIkNlALga6b8m7CDC/KnihCx3uxovPFmlxbdurWRALRJcaOknv68stULJd 0Fsk9cnxQbB783+Pq/kqaJ7OtOtjYxK5yzxXwFcJNuNSA7jB8obCSxxoXgUbAGxzl8cm UNAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="uzhC1/bi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c10si6873112edn.51.2020.04.30.07.09.55; Thu, 30 Apr 2020 07:10:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="uzhC1/bi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728836AbgD3OIe (ORCPT + 99 others); Thu, 30 Apr 2020 10:08:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:32994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728308AbgD3NwJ (ORCPT ); Thu, 30 Apr 2020 09:52:09 -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 EED0B208D5; Thu, 30 Apr 2020 13:52:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254729; bh=/Wqjtp4C2KTUJ7aU52LARgn34AvNvr/qfNFE2J64GG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uzhC1/bis+OGFDdRFX3iO44FK5EW2QI8KG8e+WgZ/o8RBpOomRLP+Yx2llDQOQQ1Y SRD4mb5pxs2sysdeF2vnnIB1dnFXbu8Ub3ZtEkMGRY8MFKWz1mmrdwf0aeW05+LjXb 814Z+SBlUiOMJScFiibVe1fPJBE7HmIYaf2cTxts= 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.6 76/79] bpf, x86_32: Fix logic error in BPF_LDX zero-extension Date: Thu, 30 Apr 2020 09:50:40 -0400 Message-Id: <20200430135043.19851-76-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135043.19851-1-sashal@kernel.org> References: <20200430135043.19851-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