Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp1271027pxa; Thu, 20 Aug 2020 07:12:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwU1+Yr+QEheJGiA9sDNq24n4Njxvwrh6RfHBDUsZnB/mXb8szEHMiV27Mq2E3I7Vebo0hV X-Received: by 2002:a17:906:4a99:: with SMTP id x25mr482258eju.439.1597932778303; Thu, 20 Aug 2020 07:12:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597932778; cv=none; d=google.com; s=arc-20160816; b=fQdC2Wl8m63/bz3WZS9/R5cmpIvXid2F8wp6tQ/w7T2Qa/okLlvqLQ/6Z1jMLfeH7J 6zNvNLYSKh8uo2CzS076uyD43lbdSOV2H7r/cH5OfNmfsG4n88sNuIaS1OtcUQBrspuQ hsv9kzHQ7eSvY4cUHIaVVGOMu6uBpxcY8eKgQaS6m0KXCtfEeb3vchp3BPIk3BhAonX8 di0CNwpdwfmG/TnBd+CRSdpU660QeIiRN0r8zHirXEjYxY3ZFCPfx84JvR7PjDBTIySt usj0IHlvsd7+PnKqDfASf5GUCIyzZidp4xAnBAJM3E7/DODFuVHqc1wKtwL0ZMHjADx2 CS/g== 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=oiK+rBr2Yq1A+CZUKtBJ0bMDLIUMfhUoB/dSDGCmoiU=; b=bFNNNCEGoGnmiFDa7To7sjRXnEw4ZCh/1S9TDXMaObdn52dbApg6cOqon41OusiIc2 M2MEaYcbdZnJruJdDpji3qHadHwV0bMHU0zAbperTK+NrjtX70oD9ZyDNu7wyBGmnzjg AMJe/ZhLSKCmCU7FJ3A0RF3RuOaJt6rNxplIbSQr5vRqZH1cSIJcxQJFbHqsnaW4Yp9i MB+/95S3GdcqTKvtA1J/pos1BxTH4iGmx/dCY7C6uai1GTtTYN6aJmhfApyz2e9QR/HI J6KawYY4tJQ/2eWVaavk7K1ht67eKZ9QZ3SAqTVt/2yjU2kziLweSjFVCtVwyw9IRb/t o3Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=N1Wu4FpE; 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=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b31si1329005edf.456.2020.08.20.07.12.33; Thu, 20 Aug 2020 07:12:58 -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=@cloudflare.com header.s=google header.b=N1Wu4FpE; 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=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729141AbgHTOJl (ORCPT + 99 others); Thu, 20 Aug 2020 10:09:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731188AbgHTN6f (ORCPT ); Thu, 20 Aug 2020 09:58:35 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31493C06134A for ; Thu, 20 Aug 2020 06:58:11 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id u18so1695420wmc.3 for ; Thu, 20 Aug 2020 06:58:11 -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=oiK+rBr2Yq1A+CZUKtBJ0bMDLIUMfhUoB/dSDGCmoiU=; b=N1Wu4FpE7GHtUguuv2GTHHLiOM28SDW14tUtNByl+IzL2uyNbEtAh22NR/IsextheV JTJHIgZQ8ZA6WXuD5mD2lBXsdW/6v8Xsy3Xr97JtniAPYSe3gcem2VMyK39urmf1WnBI 4pjoK1MIUv8EdSfCSSfCEZXJxxHnWw9hV3L1I= 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=oiK+rBr2Yq1A+CZUKtBJ0bMDLIUMfhUoB/dSDGCmoiU=; b=atZR3aTw0gaZwbeOQDp8poVBJx6a7h1lrjH5QubF5hylWgUuRV0FzXdlccin2yGkeV XZDA3y9P0u4Xsc853Dhc9PKoJ1WpXzFA43c8pjbDsoMOlD+RoDOQVkHixuukmIRkE5bH a/dEBg9SIMKIWKspCvWkeR2zhZBVb/IGMEN6ypwdLzyOtyHFrwc0LghFuWLPo4FJRqhF dnsN23pvg9/mJDrIH0eIbn37bfmofxG1Az94glwNxiwQpPfhWH3e2X1ByyHg49EgWhEW 7EQrdUotNI3yuWjEPjBtaDGhDh8hmJHEXsfFTIwthSakaHu6UY2d9184BrIK9PPoQ855 b1Cg== X-Gm-Message-State: AOAM531NQbajiF+Ts06xh5+/T9UHH6ReopKr2V0ttLRJeOIeSSmVOEsA yzKmpCrK1xLugi5t1YaGRsr+Ng== X-Received: by 2002:a7b:c0cb:: with SMTP id s11mr3613908wmh.89.1597931889816; Thu, 20 Aug 2020 06:58:09 -0700 (PDT) Received: from antares.lan (d.0.f.e.b.c.7.2.d.c.3.8.4.8.d.9.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff:9d84:83cd:27cb:ef0d]) by smtp.gmail.com with ESMTPSA id l81sm4494215wmf.4.2020.08.20.06.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 06:58:09 -0700 (PDT) From: Lorenz Bauer To: jakub@cloudflare.com, john.fastabend@gmail.com, Alexei Starovoitov , Daniel Borkmann Cc: kernel-team@cloudflare.com, Lorenz Bauer , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v2 4/6] bpf: override the meaning of ARG_PTR_TO_MAP_VALUE for sockmap and sockhash Date: Thu, 20 Aug 2020 14:57:27 +0100 Message-Id: <20200820135729.135783-5-lmb@cloudflare.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200820135729.135783-1-lmb@cloudflare.com> References: <20200820135729.135783-1-lmb@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The verifier assumes that map values are simple blobs of memory, and therefore treats ARG_PTR_TO_MAP_VALUE, etc. as such. However, there are map types where this isn't true. For example, sockmap and sockhash store sockets. In general this isn't a big problem: we can just write helpers that explicitly requests PTR_TO_SOCKET instead of ARG_PTR_TO_MAP_VALUE. The one exception are the standard map helpers like map_update_elem, map_lookup_elem, etc. Here it would be nice we could overload the function prototype for different kinds of maps. Unfortunately, this isn't entirely straight forward: We only know the type of the map once we have resolved meta->map_ptr in check_func_arg. This means we can't swap out the prototype in check_helper_call until we're half way through the function. Instead, modify check_func_arg to treat ARG_PTR_TO_MAP_VALUE* to mean "the native type for the map" instead of "pointer to memory" for sockmap and sockhash. This means we don't have to modify the function prototype at all Signed-off-by: Lorenz Bauer --- kernel/bpf/verifier.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index b6ccfce3bf4c..24feec515d3e 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3872,6 +3872,35 @@ static int int_ptr_type_to_size(enum bpf_arg_type type) return -EINVAL; } +static int resolve_map_arg_type(struct bpf_verifier_env *env, + const struct bpf_call_arg_meta *meta, + enum bpf_arg_type *arg_type) +{ + if (!meta->map_ptr) { + /* kernel subsystem misconfigured verifier */ + verbose(env, "invalid map_ptr to access map->type\n"); + return -EACCES; + } + + switch (meta->map_ptr->map_type) { + case BPF_MAP_TYPE_SOCKMAP: + case BPF_MAP_TYPE_SOCKHASH: + if (*arg_type == ARG_PTR_TO_MAP_VALUE) { + *arg_type = ARG_PTR_TO_SOCKET; + } else if (*arg_type == ARG_PTR_TO_MAP_VALUE_OR_NULL) { + *arg_type = ARG_PTR_TO_SOCKET_OR_NULL; + } else { + verbose(env, "invalid arg_type for sockmap/sockhash\n"); + return -EINVAL; + } + break; + + default: + break; + } + return 0; +} + static int check_func_arg(struct bpf_verifier_env *env, u32 arg, struct bpf_call_arg_meta *meta, const struct bpf_func_proto *fn) @@ -3904,6 +3933,14 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg, return -EACCES; } + if (arg_type == ARG_PTR_TO_MAP_VALUE || + arg_type == ARG_PTR_TO_UNINIT_MAP_VALUE || + arg_type == ARG_PTR_TO_MAP_VALUE_OR_NULL) { + err = resolve_map_arg_type(env, meta, &arg_type); + if (err) + return err; + } + if (arg_type == ARG_PTR_TO_MAP_KEY || arg_type == ARG_PTR_TO_MAP_VALUE || arg_type == ARG_PTR_TO_UNINIT_MAP_VALUE || -- 2.25.1