From patchwork Tue Jan 12 19:17:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rabin Vincent X-Patchwork-Id: 8020591 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C69F0BEEE5 for ; Tue, 12 Jan 2016 19:20:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6E2E203F4 for ; Tue, 12 Jan 2016 19:20:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 13030201F5 for ; Tue, 12 Jan 2016 19:20:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aJ4Sw-00058p-J5; Tue, 12 Jan 2016 19:18:50 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aJ4Ru-00049a-IW for linux-arm-kernel@lists.infradead.org; Tue, 12 Jan 2016 19:17:51 +0000 Received: by mail-wm0-x242.google.com with SMTP id b14so33033887wmb.1 for ; Tue, 12 Jan 2016 11:17:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9lKMT4fpEJyiVUZdhYsfrXIu9w1eZBx4FoqabNd+xiM=; b=wMIvtgfL7laCwIrNMs7jrDKnA0J4CfgLCQ3Jgx+3M+ucQBl5szcxWIK3pJikEAGngg +6e6XAiGJ/FPv0tDFOV+1HaIB2Ih5mqA5jUaDhH1OYF6LpYkxU/DiMFa+TfNXt9eCOfP BRxrSD9oAVI+YQog5w2QEPdBL1qzNPXlE0Zbz9kW9E0heBRUkoxPcmVdqUs0Rxo1mkpY if4i0a9aDZg7DiJGLdAgau6BFmSIP7lmcjuy87Rj4KqXE3KB32Uk35uG/IiRVdbBIIYd CAPdGI8vEELHCBI595cBO07i/avhGcoNYOUxF+UsI1WrL5Pq96nVoqLUBnKcaSNU3ACj faGg== X-Received: by 10.28.158.74 with SMTP id h71mr21021822wme.74.1452626244927; Tue, 12 Jan 2016 11:17:24 -0800 (PST) Received: from localhost.localdomain (90-231-144-194-no56.tbcn.telia.com. [90.231.144.194]) by smtp.gmail.com with ESMTPSA id n5sm18892522wmf.3.2016.01.12.11.17.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Jan 2016 11:17:24 -0800 (PST) From: Rabin Vincent To: davem@davemloft.net Subject: [PATCHv2] net: bpf: reject invalid shifts Date: Tue, 12 Jan 2016 20:17:08 +0100 Message-Id: <1452626228-15742-1-git-send-email-rabin@rab.in> X-Mailer: git-send-email 2.6.4 In-Reply-To: <20160112185121.GA34045@ast-mbp.thefacebook.com> References: <20160112185121.GA34045@ast-mbp.thefacebook.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160112_111747_094767_C550CC75 X-CRM114-Status: GOOD ( 12.08 ) X-Spam-Score: -2.3 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, Rabin Vincent , ast@kernel.org, daniel@iogearbox.net MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On ARM64, a BUG() is triggered in the eBPF JIT if a filter with a constant shift that can't be encoded in the immediate field of the UBFM/SBFM instructions is passed to the JIT. Since these shifts amounts, which are negative or >= regsize, are invalid, reject them in the eBPF verifier and the classic BPF filter checker, for all architectures. Signed-off-by: Rabin Vincent Acked-by: Alexei Starovoitov Acked-by: Daniel Borkmann --- v2: handle BPF_ARSH too kernel/bpf/verifier.c | 10 ++++++++++ net/core/filter.c | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index a7945d10b378..d1d3e8f57de9 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -1121,6 +1121,16 @@ static int check_alu_op(struct verifier_env *env, struct bpf_insn *insn) return -EINVAL; } + if ((opcode == BPF_LSH || opcode == BPF_RSH || + opcode == BPF_ARSH) && BPF_SRC(insn->code) == BPF_K) { + int size = BPF_CLASS(insn->code) == BPF_ALU64 ? 64 : 32; + + if (insn->imm < 0 || insn->imm >= size) { + verbose("invalid shift %d\n", insn->imm); + return -EINVAL; + } + } + /* pattern match 'bpf_add Rx, imm' instruction */ if (opcode == BPF_ADD && BPF_CLASS(insn->code) == BPF_ALU64 && regs[insn->dst_reg].type == FRAME_PTR && diff --git a/net/core/filter.c b/net/core/filter.c index 672eefbfbe99..37157c4c1a78 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -777,6 +777,11 @@ static int bpf_check_classic(const struct sock_filter *filter, if (ftest->k == 0) return -EINVAL; break; + case BPF_ALU | BPF_LSH | BPF_K: + case BPF_ALU | BPF_RSH | BPF_K: + if (ftest->k >= 32) + return -EINVAL; + break; case BPF_LD | BPF_MEM: case BPF_LDX | BPF_MEM: case BPF_ST: