Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp2869991pxk; Mon, 28 Sep 2020 02:11:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysyy8njFJszcoIwfTIp6Ag3r9aVEP8o0XSdwa8HL3XzPEssgNgL5imEFbTLa14Zfsy60b9 X-Received: by 2002:a17:907:444f:: with SMTP id on23mr685738ejb.392.1601284294126; Mon, 28 Sep 2020 02:11:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601284294; cv=none; d=google.com; s=arc-20160816; b=LsjlpOYz3hSmI5FTi1O0QeMUAAmBudLDX2MOJOLICUx3MmxaezgCpwBA0HHGXHzrk+ 9S310xdfkqnpkMt/0ba0/zNAxzuoxApuCL/yicXlTUkYyD2n1xgM1+eGNT5s61hZJCKk cpb/W8LTqjJ+qNqqpd8hCMfJAXvYecAB0JuNTx4mQVNo5tA4QmXPNk4AtZ4s5nCpn9/Y j5sjrXwxq+qShl6qYz1sol4RyKNudbubaef8wgylTL3TNS/D4HgDA5pWcRX9T2L4kJNj T+jjo0Ren4vaz9jVnvhayLDcUHH+1TIgGIlCd2S0AYo0x7BD9uoJIAWkJkBtHCJLMc2U oJgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YYDixzevsPSo33JShdSdjhqxSjI9v2Xq4t4tapCfmzk=; b=uKGTx3aTVTGT4bnrmziuIU5qL+Q+RZX1TRuz0oz35vxXMiXbpzK2z7CQWntaCtvkrZ VugZGud3FDN9bNzHQhntjnTns27Ew8K81S9gbdUh3hBg4yxpexNVdCxaUKuBh8GYuaum eDtg/vfECOBGNeIytDnXVcadW834aphuNyb6f2Mx1k55jhlCtKJSNc8IZNohI74J4Ksi kgDkkS9r2dhkNv+gPnFdca9RxNnFFv7NXmINwNyym4Jhr78gSzWLUY5zfNXCYExzql/R DQse9dtFBvyRVJD2umrHy0NlKi8dU/2b58Uel0ccPdJNNLx7KmUkJy/DPAsZ/esQAAsE 6iMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=jDzH51be; 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 bl18si252126ejb.171.2020.09.28.02.11.11; Mon, 28 Sep 2020 02:11:34 -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=jDzH51be; 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 S1726751AbgI1JIo (ORCPT + 99 others); Mon, 28 Sep 2020 05:08:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726607AbgI1JIl (ORCPT ); Mon, 28 Sep 2020 05:08:41 -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 07A81C0613CF for ; Mon, 28 Sep 2020 02:08:41 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id s13so260797wmh.4 for ; Mon, 28 Sep 2020 02:08:40 -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=YYDixzevsPSo33JShdSdjhqxSjI9v2Xq4t4tapCfmzk=; b=jDzH51beXtsOfB5MJ8R22hnkg/gHOPyEjJHn/cNlWySXVRMGQbYWwsdWvbwnpylU96 qNnXBoEaiJ9O5z5cvIaA7m8treB9upUGgld7sgE8DnpVXHVLdWjhFObGqrNY622rBror XRyepHPi1wvGk3ZidPT2kuHpJACmt4KdJ758M= 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=YYDixzevsPSo33JShdSdjhqxSjI9v2Xq4t4tapCfmzk=; b=UBafIL3+96JLxJWz32uWE5vksvyrIdqcpUtqCORugOl1WVC4pfvpyH4XmUQUgCvzuv 2O/bniDZFQFySUEriU+eLWK+X90HfZGzlhalu9mVp3Jhdp+TyhOvZejZnOwYaqu9MzDb dkpJ02D9y7i8+0WwBFej4lIArWMccRWorDa5RP788awrGtdxH4jWgprov8E1ZdCyEisT ipCzIbF8pfZwqjYNFVN0IUfBtVovoAiVMta7MJysYDRfH0J7hcAZ1F4Nq4+oxD/K6mSZ dg8ZARD7t7Ih4xyof8M3tltPoDibwMsvkAdkC+jv5eP0prI9M7EG/uTKBiLqvZemK7YR V5Gg== X-Gm-Message-State: AOAM530BweIsQSBZx8USaYxPpN/YJ87f1j01CBrnsqzM9rcx/h53wR1t hu9ZIV5/qOdED9j+VLhPAfks/A== X-Received: by 2002:a7b:c210:: with SMTP id x16mr556653wmi.37.1601284119617; Mon, 28 Sep 2020 02:08:39 -0700 (PDT) Received: from antares.lan (1.f.1.6.a.e.6.5.a.0.3.2.4.7.4.0.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff:474:230a:56ea:61f1]) by smtp.gmail.com with ESMTPSA id u13sm479631wrm.77.2020.09.28.02.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 02:08:39 -0700 (PDT) From: Lorenz Bauer To: kafai@fb.com, Alexei Starovoitov , Daniel Borkmann , John Fastabend , Jakub Sitnicki , Lorenz Bauer , "David S. Miller" , Jakub Kicinski Cc: kernel-team@cloudflare.com, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v2 1/4] bpf: sockmap: enable map_update_elem from bpf_iter Date: Mon, 28 Sep 2020 10:08:02 +0100 Message-Id: <20200928090805.23343-2-lmb@cloudflare.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928090805.23343-1-lmb@cloudflare.com> References: <20200928090805.23343-1-lmb@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow passing a pointer to a BTF struct sock_common* when updating a sockmap or sockhash. Since BTF pointers can fault and therefore be NULL at runtime we need to add an additional !sk check to sock_map_update_elem. Since we may be passed a request or timewait socket we also need to check sk_fullsock. Doing this allows calling map_update_elem on sockmap from bpf_iter context, which uses BTF pointers. Signed-off-by: Lorenz Bauer --- kernel/bpf/verifier.c | 2 +- net/core/sock_map.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index b25ba989c2dc..cc9c90d74dc1 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3943,7 +3943,7 @@ static int resolve_map_arg_type(struct bpf_verifier_env *env, case BPF_MAP_TYPE_SOCKMAP: case BPF_MAP_TYPE_SOCKHASH: if (*arg_type == ARG_PTR_TO_MAP_VALUE) { - *arg_type = ARG_PTR_TO_SOCKET; + *arg_type = ARG_PTR_TO_BTF_ID_SOCK_COMMON; } else { verbose(env, "invalid arg_type for sockmap/sockhash\n"); return -EINVAL; diff --git a/net/core/sock_map.c b/net/core/sock_map.c index e1f05e3fa1d0..08bc86f51593 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -610,6 +610,9 @@ static int sock_map_update_elem(struct bpf_map *map, void *key, struct sock *sk = (struct sock *)value; int ret; + if (unlikely(!sk || !sk_fullsock(sk))) + return -EINVAL; + if (!sock_map_sk_is_suitable(sk)) return -EOPNOTSUPP; -- 2.25.1