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.9 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_HELO_NONE,SPF_PASS,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 68062C3F2D3 for ; Fri, 28 Feb 2020 11:54:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3AB6D246B2 for ; Fri, 28 Feb 2020 11:54:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="Kfq1WCVg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725802AbgB1Lyg (ORCPT ); Fri, 28 Feb 2020 06:54:36 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:44824 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725877AbgB1Lyg (ORCPT ); Fri, 28 Feb 2020 06:54:36 -0500 Received: by mail-wr1-f66.google.com with SMTP id m16so2579691wrx.11 for ; Fri, 28 Feb 2020 03:54:34 -0800 (PST) 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=p/IkxmE2XQKvvaJ3+jizWlUITUqYZdNJGm8v0gfliUM=; b=Kfq1WCVgU73x9jff4qBeqW5es8Zs2Cx+sMSyqlg4qPOtbVipTmPiKTENK9xj11Xd23 OXVKrbNWfAEsnY3A7a8kmphKkf7x8P5vWBvnuL4MFRoDxPAH7vAhVJjcJ0aZu9BjNqZ1 ncnQLhC4Rj/MPzM8sCsHPUx1r1OR8ogIzo5I4= 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=p/IkxmE2XQKvvaJ3+jizWlUITUqYZdNJGm8v0gfliUM=; b=kRnuO4suonOsOrbpMcrBCFux5+zyHsKE3uMReix8OWAxA1e01AW36OvoRisEBUlri1 HH46MM5Jt2dpHD84LNpTH3K9V+Mc4C0WNiBcY7pcTxBClGJ79OYdjmHAVsTfwch7epQK 60p74zwOze8BOAmdvmkG5N0fsne7gZWtg8QT8UwejrjQUqQzvXGLKdpiVaX6C+Da0N/j kVy5SIm5bmqDD0Io8wfa/YNVtC+QmiqxMVvMS0nNvSfqHpOsl36VOjwMJpX/NqS6l4ek pOsUR06RCBSJ8qYOcC08Me3oJBjC8UmqQynebMxUJH9FuFhOTSvhMr9kFVm0q8Gu/UMk JtFg== X-Gm-Message-State: APjAAAUnI9G0vU2cztZtljoVkr0G/s1uQ1XXOXCfzh+toU9Eu2b4lCso ntu7CnPdg5yOV7i3Uja7YJYzTg== X-Google-Smtp-Source: APXvYqwUxSfb9lzvkCHJt6DbgjNm7J7iIaMQ3dHV1KlH7ju+YZAsfdnsRU0PSfwwU+3oQeDG6J0qgw== X-Received: by 2002:a5d:674c:: with SMTP id l12mr4752283wrw.351.1582890872961; Fri, 28 Feb 2020 03:54:32 -0800 (PST) Received: from antares.lan (b.2.d.a.1.b.1.b.2.c.5.e.0.3.d.4.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff:4d30:e5c2:b1b1:ad2b]) by smtp.gmail.com with ESMTPSA id q125sm2044284wme.19.2020.02.28.03.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 03:54:32 -0800 (PST) From: Lorenz Bauer To: john.fastabend@gmail.com, Daniel Borkmann , Jakub Sitnicki , Lorenz Bauer , "David S. Miller" , Jakub Kicinski , Alexei Starovoitov Cc: kernel-team@cloudflare.com, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v2 1/9] bpf: sockmap: only check ULP for TCP sockets Date: Fri, 28 Feb 2020 11:53:36 +0000 Message-Id: <20200228115344.17742-2-lmb@cloudflare.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228115344.17742-1-lmb@cloudflare.com> References: <20200228115344.17742-1-lmb@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org The sock map code checks that a socket does not have an active upper layer protocol before inserting it into the map. This requires casting via inet_csk, which isn't valid for UDP sockets. Guard checks for ULP by checking inet_sk(sk)->is_icsk first. Signed-off-by: Lorenz Bauer --- include/linux/skmsg.h | 8 +++++++- net/core/sock_map.c | 11 +++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h index 112765bd146d..54a9a3e36b29 100644 --- a/include/linux/skmsg.h +++ b/include/linux/skmsg.h @@ -360,7 +360,13 @@ static inline void sk_psock_restore_proto(struct sock *sk, struct sk_psock *psock) { sk->sk_prot->unhash = psock->saved_unhash; - tcp_update_ulp(sk, psock->sk_proto, psock->saved_write_space); + if (inet_sk(sk)->is_icsk) { + tcp_update_ulp(sk, psock->sk_proto, psock->saved_write_space); + } else { + sk->sk_write_space = psock->saved_write_space; + /* Pairs with lockless read in sk_clone_lock() */ + WRITE_ONCE(sk->sk_prot, psock->sk_proto); + } } static inline void sk_psock_set_state(struct sk_psock *psock, diff --git a/net/core/sock_map.c b/net/core/sock_map.c index 2e0f465295c3..695ecacc7afa 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -94,6 +94,11 @@ static void sock_map_sk_release(struct sock *sk) release_sock(sk); } +static bool sock_map_sk_has_ulp(struct sock *sk) +{ + return inet_sk(sk)->is_icsk && !!inet_csk(sk)->icsk_ulp_ops; +} + static void sock_map_add_link(struct sk_psock *psock, struct sk_psock_link *link, struct bpf_map *map, void *link_raw) @@ -384,7 +389,6 @@ static int sock_map_update_common(struct bpf_map *map, u32 idx, struct sock *sk, u64 flags) { struct bpf_stab *stab = container_of(map, struct bpf_stab, map); - struct inet_connection_sock *icsk = inet_csk(sk); struct sk_psock_link *link; struct sk_psock *psock; struct sock *osk; @@ -395,7 +399,7 @@ static int sock_map_update_common(struct bpf_map *map, u32 idx, return -EINVAL; if (unlikely(idx >= map->max_entries)) return -E2BIG; - if (unlikely(rcu_access_pointer(icsk->icsk_ulp_data))) + if (sock_map_sk_has_ulp(sk)) return -EINVAL; link = sk_psock_init_link(); @@ -738,7 +742,6 @@ static int sock_hash_update_common(struct bpf_map *map, void *key, struct sock *sk, u64 flags) { struct bpf_htab *htab = container_of(map, struct bpf_htab, map); - struct inet_connection_sock *icsk = inet_csk(sk); u32 key_size = map->key_size, hash; struct bpf_htab_elem *elem, *elem_new; struct bpf_htab_bucket *bucket; @@ -749,7 +752,7 @@ static int sock_hash_update_common(struct bpf_map *map, void *key, WARN_ON_ONCE(!rcu_read_lock_held()); if (unlikely(flags > BPF_EXIST)) return -EINVAL; - if (unlikely(icsk->icsk_ulp_data)) + if (sock_map_sk_has_ulp(sk)) return -EINVAL; link = sk_psock_init_link(); -- 2.20.1