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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 DB3C0C5518B for ; Wed, 22 Apr 2020 17:36:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC85D2082E for ; Wed, 22 Apr 2020 17:36:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cs.washington.edu header.i=@cs.washington.edu header.b="NBfIrE2N" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726711AbgDVRgz (ORCPT ); Wed, 22 Apr 2020 13:36:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726655AbgDVRgy (ORCPT ); Wed, 22 Apr 2020 13:36:54 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F519C03C1AB for ; Wed, 22 Apr 2020 10:36:54 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id t16so1212223plo.7 for ; Wed, 22 Apr 2020 10:36:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=upttJD2FlVOwQ9TcHJ5acrg3a8ThasRlmqF+H/glYss=; b=NBfIrE2NjATpSGVDPNE+eakCKhcK491SMXS/kR2TKZL8ND/4YKdgiho0fYch+YM0x3 XKtxnoC3m7J4rsHW0IJSKDqWhhsUHzLRXNRQ+dXmwE7HM4hPbnbD9SG3pq+bonaFUv1N OZsmFi2XvW6HsoLuZg3mj5gSfzRVJyzs3/4LY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=upttJD2FlVOwQ9TcHJ5acrg3a8ThasRlmqF+H/glYss=; b=hgjIABtlDADG5qVE0j0AaS0smNE15DHnyz5BN1X04uffTq7pzlFYuWO1zziSvoC9v7 xH5vfb6BT52W8i1CucXVJGx2K+NgeY9xkFdSy+MYb44R1nbo3X2gdqskUbQYjsIyUJI5 URYE0VNuMraEGjTXvNCdeXoXXiZv7FKC1dUDBRN/Eq1zatc70MalnH4AiY1ifK1J44nM wsccvbt4jwaK3ZoxAaBxWty7MrFimjyP9G2KUFdrXMWayjj5TgmQl0eH6xFeKbgLrYS/ HeRTbglc4LpDhFrLOju7VF0jYRfRQFeYSKdXBFuCCK92GjdD7hefzxiMmIvX2LGZtgfS MF+Q== X-Gm-Message-State: AGi0PuYXWMJhAj/LH/2FAuMHPgm17DLTxcbOgW1g3o2iUS9tughE5MQp Htct2Mm9ymmOJoT731YYK8kHwO836K1Qag== X-Google-Smtp-Source: APiQypLCQlRsvYOCNibbXTv7c6Hr1Yx/DPiTsvnw69F/7aVpdz8tsAYZaMLNIKgW3A4iiDXLYk8n6Q== X-Received: by 2002:a17:90a:b10f:: with SMTP id z15mr11890687pjq.188.1587577013353; Wed, 22 Apr 2020 10:36:53 -0700 (PDT) Received: from localhost.localdomain (c-73-53-94-119.hsd1.wa.comcast.net. [73.53.94.119]) by smtp.gmail.com with ESMTPSA id 1sm59514pff.151.2020.04.22.10.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 10:36:52 -0700 (PDT) From: Luke Nelson X-Google-Original-From: Luke Nelson To: bpf@vger.kernel.org Cc: Brian Gerst , Luke Nelson , Xi Wang , "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , Wang YanQing , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf v2 2/2] bpf, x86_32: Fix clobbering of dst for BPF_JSET Date: Wed, 22 Apr 2020 10:36:30 -0700 Message-Id: <20200422173630.8351-2-luke.r.nels@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200422173630.8351-1-luke.r.nels@gmail.com> References: <20200422173630.8351-1-luke.r.nels@gmail.com> Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org The current JIT clobbers the destination register for BPF_JSET BPF_X and BPF_K by using "and" and "or" instructions. This is fine when the destination register is a temporary loaded from a register stored on the stack but not otherwise. This patch fixes the problem (for both BPF_K and BPF_X) by always loading the destination register into temporaries since BPF_JSET should not modify the destination register. This bug may not be currently triggerable as BPF_REG_AX is the only register not stored on the stack and the verifier uses it in a limited way. Fixes: 03f5781be2c7b ("bpf, x86_32: add eBPF JIT compiler for ia32") Signed-off-by: Xi Wang Signed-off-by: Luke Nelson --- v1 -> v2: No changes. --- arch/x86/net/bpf_jit_comp32.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c index cc9ad3892ea6..ba7d9ccfc662 100644 --- a/arch/x86/net/bpf_jit_comp32.c +++ b/arch/x86/net/bpf_jit_comp32.c @@ -2015,8 +2015,8 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, case BPF_JMP | BPF_JSET | BPF_X: case BPF_JMP32 | BPF_JSET | BPF_X: { bool is_jmp64 = BPF_CLASS(insn->code) == BPF_JMP; - u8 dreg_lo = dstk ? IA32_EAX : dst_lo; - u8 dreg_hi = dstk ? IA32_EDX : dst_hi; + u8 dreg_lo = IA32_EAX; + u8 dreg_hi = IA32_EDX; u8 sreg_lo = sstk ? IA32_ECX : src_lo; u8 sreg_hi = sstk ? IA32_EBX : src_hi; @@ -2028,6 +2028,13 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, add_2reg(0x40, IA32_EBP, IA32_EDX), STACK_VAR(dst_hi)); + } else { + /* mov dreg_lo,dst_lo */ + EMIT2(0x89, add_2reg(0xC0, dreg_lo, dst_lo)); + if (is_jmp64) + /* mov dreg_hi,dst_hi */ + EMIT2(0x89, + add_2reg(0xC0, dreg_hi, dst_hi)); } if (sstk) { @@ -2052,8 +2059,8 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, case BPF_JMP | BPF_JSET | BPF_K: case BPF_JMP32 | BPF_JSET | BPF_K: { bool is_jmp64 = BPF_CLASS(insn->code) == BPF_JMP; - u8 dreg_lo = dstk ? IA32_EAX : dst_lo; - u8 dreg_hi = dstk ? IA32_EDX : dst_hi; + u8 dreg_lo = IA32_EAX; + u8 dreg_hi = IA32_EDX; u8 sreg_lo = IA32_ECX; u8 sreg_hi = IA32_EBX; u32 hi; @@ -2066,6 +2073,13 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, add_2reg(0x40, IA32_EBP, IA32_EDX), STACK_VAR(dst_hi)); + } else { + /* mov dreg_lo,dst_lo */ + EMIT2(0x89, add_2reg(0xC0, dreg_lo, dst_lo)); + if (is_jmp64) + /* mov dreg_hi,dst_hi */ + EMIT2(0x89, + add_2reg(0xC0, dreg_hi, dst_hi)); } /* mov ecx,imm32 */ -- 2.17.1