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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 CFDE6C4360F for ; Fri, 22 Mar 2019 01:54:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DA2B21900 for ; Fri, 22 Mar 2019 01:54:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="CxQzIgv/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727606AbfCVBy1 (ORCPT ); Thu, 21 Mar 2019 21:54:27 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:41660 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727456AbfCVBy1 (ORCPT ); Thu, 21 Mar 2019 21:54:27 -0400 Received: by mail-pg1-f194.google.com with SMTP id k11so338271pgb.8 for ; Thu, 21 Mar 2019 18:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FZY4iMerFf3oc3fyXl4BxDRKcJ+uuJ5mc1g/4bPlNws=; b=CxQzIgv/1BV0szdswL32lV97Oe20rEXDU5VsiqxwGvlDGFF4FKb4KsbEfsLARHX+3Q qITlE/52GTmHTw5miTCpzxLebLWOCGtDp2EFQjHs8FyFQkiMBp4K3nem58P+gBwvYMEq u0rIM9gDjVs3x6WaQ+vYeTEWUcJPZGAMNOIT0= 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:mime-version:content-transfer-encoding; bh=FZY4iMerFf3oc3fyXl4BxDRKcJ+uuJ5mc1g/4bPlNws=; b=AgpomIFyWMHVWDV9CunJE5wzB4Mv68V2a6hy7YVZAnF80KeydupvSujvhZzayW/L7d zlY6yd1dG0QtGml1r4XEtd94rM453EBk58U00mnCI9xT38lctoeVwBUbiMl62yKomiMs tzFyvBacygskhJvpwDH2Wt9JSEnvdidWdrPhDA2bNeOglEXNKRoIcEFCKT0fvt30Bqjl fovctk8AJ+mVulm93ERAtLoyDyer40TZTTuNuLHBGUb6cDmgXrk2pv2rjL8a/fyrWrXb XGQCWuFerokDUGOJ4s+R8WfwfIxF5mC3tid/VxNEUlzXtB5D+YLs3z0m489YbcjtD654 YXNg== X-Gm-Message-State: APjAAAXcOXeniQj7no3R0k4uXDApPCYukCSrEqf/WU9kPcXaq+yoKvKy OZ3BLY1FZy87GYolFR/bHIaP7A== X-Google-Smtp-Source: APXvYqzJbqBWmUZ9WA3da8Hzr8owuV/cfFhx1Ie5ZQzDkJgS6dOF+TROS94nSq6aV5nbC6wq/6K/tg== X-Received: by 2002:a62:7049:: with SMTP id l70mr6607371pfc.78.1553219666394; Thu, 21 Mar 2019 18:54:26 -0700 (PDT) Received: from localhost.localdomain ([157.120.241.186]) by smtp.gmail.com with ESMTPSA id i10sm7161799pgs.26.2019.03.21.18.54.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 18:54:25 -0700 (PDT) From: Lorenz Bauer To: ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org, bpf@vger.kernel.org Cc: kafai@fb.com, Lorenz Bauer Subject: [PATCH bpf-next v3 1/8] bpf: track references based on is_acquire_func Date: Fri, 22 Mar 2019 09:53:59 +0800 Message-Id: <20190322015406.26453-2-lmb@cloudflare.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190322015406.26453-1-lmb@cloudflare.com> References: <20190319102103.7380-1-lmb@cloudflare.com> <20190322015406.26453-1-lmb@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org So far, the verifier only acquires reference tracking state for RET_PTR_TO_SOCKET_OR_NULL. Instead of extending this for every new return type which desires these semantics, acquire reference tracking state iff the called helper is an acquire function. Signed-off-by: Lorenz Bauer --- kernel/bpf/verifier.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 86f9cd5d1c4e..868a82ad5597 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3147,19 +3147,7 @@ static int check_helper_call(struct bpf_verifier_env *env, int func_id, int insn } else if (fn->ret_type == RET_PTR_TO_SOCKET_OR_NULL) { mark_reg_known_zero(env, regs, BPF_REG_0); regs[BPF_REG_0].type = PTR_TO_SOCKET_OR_NULL; - if (is_acquire_function(func_id)) { - int id = acquire_reference_state(env, insn_idx); - - if (id < 0) - return id; - /* For mark_ptr_or_null_reg() */ - regs[BPF_REG_0].id = id; - /* For release_reference() */ - regs[BPF_REG_0].ref_obj_id = id; - } else { - /* For mark_ptr_or_null_reg() */ - regs[BPF_REG_0].id = ++env->id_gen; - } + regs[BPF_REG_0].id = ++env->id_gen; } else if (fn->ret_type == RET_PTR_TO_TCP_SOCK_OR_NULL) { mark_reg_known_zero(env, regs, BPF_REG_0); regs[BPF_REG_0].type = PTR_TO_TCP_SOCK_OR_NULL; @@ -3170,9 +3158,19 @@ static int check_helper_call(struct bpf_verifier_env *env, int func_id, int insn return -EINVAL; } - if (is_ptr_cast_function(func_id)) + if (is_ptr_cast_function(func_id)) { /* For release_reference() */ regs[BPF_REG_0].ref_obj_id = meta.ref_obj_id; + } else if (is_acquire_function(func_id)) { + int id = acquire_reference_state(env, insn_idx); + + if (id < 0) + return id; + /* For mark_ptr_or_null_reg() */ + regs[BPF_REG_0].id = id; + /* For release_reference() */ + regs[BPF_REG_0].ref_obj_id = id; + } do_refine_retval_range(regs, fn->ret_type, func_id, &meta); -- 2.19.1