Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2002884imu; Fri, 14 Dec 2018 04:20:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/W41rTK0whCehpW0R4LM9Hx2NqEE3aOdPpPO8xoqPsRlxZio3aJf56Lt+aFrcbV16dwZM5N X-Received: by 2002:a63:7a09:: with SMTP id v9mr1206115pgc.112.1544790020325; Fri, 14 Dec 2018 04:20:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544790020; cv=none; d=google.com; s=arc-20160816; b=fKXBZeR8XiT86j5ixsKw7ZaxHJm01apN+E8oaRh7y1KitjqHhzA+mmwqyuwoh83yEg DA2NjUaMqGL8YnYrYvbHZCJugZk1EU3ONlz0vXG5DEEL/D094aqC7ZEs1uDZZvfw8wQk en4wuUxZQ6Mj0NolDbWYPAkXRACGMZE1iRPuv5lzjHFKOCMVi0jYhS171p5Tbe/t1H7M FGXJcl9FmvHNbSYgtxsukd2RLAojf2Y/LTJiYjnl8g+Sme7dVb23ghTfc0/MiCRhOddI H0nvq3cBv7qcHNGkvfPl7/wHHo+Vr30rlAIkNUbl6GoH+ADzpv5qVuxEwuPeSpXfGtdx GF1w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=V9ur+k2aYrQ99QDMqnd/QXJerKfQrSLj+frJHU1mQXc=; b=MW74g13QQYJVO5gf6e9Ew+7QCc3saFhXAGis3B8ha89+GFAQCDIkiAqk6R04bgEDG0 982fdwBeCV+TUvTVtzyjCwY9bTvsN4zfhei3D1vFQ6Kgasx4S6jDJXHbCLofTX5GNIMt 5HdtKoAxVRWY4bI38INlCEMkgeZAcC5OFW1bFSceQGaMRxgx0hfai3lrWD+BDXKn9AWd 83t6sh34KOkwJSwzfnlK9lD0HFsTNSOYmFrR1nnbdCsPJacKwCw72C9WFbNtdDGmrK3F hDr+v1NwdaFaUiW/jjT87c27GJKhSGpKpmo0Hq6OL3Z6nPj8CSAe4yDCXd+XV7aMQ3rg 1csg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uE3wLUkn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b30si4207607pla.285.2018.12.14.04.20.05; Fri, 14 Dec 2018 04:20:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uE3wLUkn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732541AbeLNMSH (ORCPT + 99 others); Fri, 14 Dec 2018 07:18:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:36956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732810AbeLNMQo (ORCPT ); Fri, 14 Dec 2018 07:16:44 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 A35152148E; Fri, 14 Dec 2018 12:16:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544789804; bh=NJHspLz/WGWcC50f9uFlHL510jE5InGCIq2y+4Y58ts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uE3wLUknvHkytto3/nhXg20NqTPx/mdKwhKT5jG5tPeAjvFUfzUZXdslFVZik85E2 LxrOiwauJ7dpE5gcYnBoEtgw+vqU1favrTtn96a5n/+6WG+shmAMhEQ3xcRiyijc4U nQKxGH8B32GEEOoITyqHI9Ahd8uv81BSKkot34yQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , "David S. Miller" , Ben Hutchings Subject: [PATCH 4.4 62/88] bpf: support 8-byte metafield access Date: Fri, 14 Dec 2018 13:00:36 +0100 Message-Id: <20181214115707.501910891@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214115702.151309521@linuxfoundation.org> References: <20181214115702.151309521@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexei Starovoitov commit cedaf52693f02372010548c63b2e63228b959099 upstream. The verifier supported only 4-byte metafields in struct __sk_buff and struct xdp_md. The metafields in upcoming struct bpf_perf_event are 8-byte to match register width in struct pt_regs. Teach verifier to recognize 8-byte metafield access. The patch doesn't affect safety of sockets and xdp programs. They check for 4-byte only ctx access before these conditions are hit. Signed-off-by: Alexei Starovoitov Acked-by: Daniel Borkmann Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- kernel/bpf/verifier.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -1844,7 +1844,8 @@ static int do_check(struct verifier_env if (err) return err; - if (BPF_SIZE(insn->code) != BPF_W) { + if (BPF_SIZE(insn->code) != BPF_W && + BPF_SIZE(insn->code) != BPF_DW) { insn_idx++; continue; } @@ -2220,9 +2221,11 @@ static int convert_ctx_accesses(struct v for (i = 0; i < insn_cnt; i++, insn++) { u32 cnt; - if (insn->code == (BPF_LDX | BPF_MEM | BPF_W)) + if (insn->code == (BPF_LDX | BPF_MEM | BPF_W) || + insn->code == (BPF_LDX | BPF_MEM | BPF_DW)) type = BPF_READ; - else if (insn->code == (BPF_STX | BPF_MEM | BPF_W)) + else if (insn->code == (BPF_STX | BPF_MEM | BPF_W) || + insn->code == (BPF_STX | BPF_MEM | BPF_DW)) type = BPF_WRITE; else continue;