From patchwork Thu Jul 16 02:36:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khalid Elmously X-Patchwork-Id: 1329941 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6dgn6Mrnz9sTR; Thu, 16 Jul 2020 12:37:09 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jvtle-0007fd-PL; Thu, 16 Jul 2020 02:37:02 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jvtlP-0007Sz-Ml for kernel-team@lists.ubuntu.com; Thu, 16 Jul 2020 02:36:47 +0000 Received: from mail-qv1-f70.google.com ([209.85.219.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jvtlO-0001vF-ND for kernel-team@lists.ubuntu.com; Thu, 16 Jul 2020 02:36:46 +0000 Received: by mail-qv1-f70.google.com with SMTP id l12so2528660qvu.21 for ; Wed, 15 Jul 2020 19:36:46 -0700 (PDT) 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; bh=9cQV9biU03HzKPbPdZ0dSHfczrY87zku4RfhAdDSLhc=; b=P4Dq65cmA+zkPEjiuA38gIUG46Du9Byq7SlfuWv+H5TGSO26LxZWmAAjeIXv9deZin D4YSzpdcxYg37azstHZXykki48PCY2ZiySainU/ygDYkc9D+dbFziwCxiEupSg60oEYW 3JNkuPmSBI5JSpWmIR5yxkCcPGOMWQnTLeyM+mcq7Pj2aTOvhPNvGAH9jJMtW56M3j/B K0jMUvXtZe8Td6huSIJDBvND+fJGVVP5bMsP1zVYWpSeVlpPpOc0TcnNfE1wnuq16WR4 Idw8z2IGAq9xhIeDClAVWX2rAZZB/AOMQJxeNbTyIM3PAOhbid5fc15yD91X3Hm9cAgM n+TQ== X-Gm-Message-State: AOAM532lXK/AGHCLIScT29+lZQJMXPHebBZxBfmqLbMURgz4yYXjV8s0 XVfmJpFgcteCXSm6+SAROGWx07IK0CmKy69Hx4VNiwcLLhLQXdcxugNDzadLrGxXs1sd3402vUZ 30p7Y9lGCIU+31cpc8vuCbmxr5oSRAiwLSem3Iox0/A== X-Received: by 2002:a37:9f10:: with SMTP id i16mr1805100qke.15.1594867005457; Wed, 15 Jul 2020 19:36:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdqPIP3Jvarhh08sIxsRpI5bX5xK36N4w8h7kV9Upgi+w0/M3YWZUPNGJ19Jhnej8aHyvIZA== X-Received: by 2002:a37:9f10:: with SMTP id i16mr1805091qke.15.1594867005063; Wed, 15 Jul 2020 19:36:45 -0700 (PDT) Received: from kbuntu2.fuzzbuzz.org (dhcp-24-53-242-104.cable.user.start.ca. [24.53.242.104]) by smtp.gmail.com with ESMTPSA id x26sm5277927qtr.4.2020.07.15.19.36.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 19:36:44 -0700 (PDT) From: Khalid Elmously To: kernel-team@lists.ubuntu.com Subject: [PATCH 12/13] bpf: Don't refcount LISTEN sockets in sk_assign() Date: Wed, 15 Jul 2020 22:36:18 -0400 Message-Id: <20200716023619.13688-13-khalid.elmously@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200716023619.13688-1-khalid.elmously@canonical.com> References: <20200716023619.13688-1-khalid.elmously@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Joe Stringer [ upstream commit 7ae215d23c12a939005f35d1848ca55b6109b9c0 ] Avoid taking a reference on listen sockets by checking the socket type in the sk_assign and in the corresponding skb_steal_sock() code in the the transport layer, and by ensuring that the prefetch free (sock_pfree) function uses the same logic to check whether the socket is refcounted. Suggested-by: Martin KaFai Lau Signed-off-by: Joe Stringer Signed-off-by: Alexei Starovoitov Acked-by: Martin KaFai Lau Link: https://lore.kernel.org/bpf/20200329225342.16317-4-joe@wand.net.nz Signed-off-by: Daniel Borkmann Signed-off-by: Khalid Elmously --- include/net/sock.h | 25 +++++++++++++++++-------- net/core/filter.c | 6 +++--- net/core/sock.c | 3 ++- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 6cb1f0efa01b..e13e9b7c34d1 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2492,6 +2492,21 @@ skb_sk_is_prefetched(struct sk_buff *skb) #endif /* CONFIG_INET */ } +/* This helper checks if a socket is a full socket, + * ie _not_ a timewait or request socket. + */ +static inline bool sk_fullsock(const struct sock *sk) +{ + return (1 << sk->sk_state) & ~(TCPF_TIME_WAIT | TCPF_NEW_SYN_RECV); +} + +static inline bool +sk_is_refcounted(struct sock *sk) +{ + /* Only full sockets have sk->sk_flags. */ + return !sk_fullsock(sk) || !sock_flag(sk, SOCK_RCU_FREE); +} + /** * skb_steal_sock * @skb to steal the socket from @@ -2504,6 +2519,8 @@ skb_steal_sock(struct sk_buff *skb, bool *refcounted) struct sock *sk = skb->sk; *refcounted = true; + if (skb_sk_is_prefetched(skb)) + *refcounted = sk_is_refcounted(sk); skb->destructor = NULL; skb->sk = NULL; return sk; @@ -2512,14 +2529,6 @@ skb_steal_sock(struct sk_buff *skb, bool *refcounted) return NULL; } -/* This helper checks if a socket is a full socket, - * ie _not_ a timewait or request socket. - */ -static inline bool sk_fullsock(const struct sock *sk) -{ - return (1 << sk->sk_state) & ~(TCPF_TIME_WAIT | TCPF_NEW_SYN_RECV); -} - /* Checks if this SKB belongs to an HW offloaded socket * and whether any SW fallbacks are required based on dev. * Check decrypted mark in case skb_orphan() cleared socket. diff --git a/net/core/filter.c b/net/core/filter.c index 4033799dafd5..baaeab75327c 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5468,8 +5468,7 @@ static const struct bpf_func_proto bpf_sk_lookup_udp_proto = { BPF_CALL_1(bpf_sk_release, struct sock *, sk) { - /* Only full sockets have sk->sk_flags. */ - if (!sk_fullsock(sk) || !sock_flag(sk, SOCK_RCU_FREE)) + if (sk_is_refcounted(sk)) sock_gen_put(sk); return 0; } @@ -5995,7 +5994,8 @@ BPF_CALL_3(bpf_sk_assign, struct sk_buff *, skb, struct sock *, sk, u64, flags) return -ENETUNREACH; if (unlikely(sk->sk_reuseport)) return -ESOCKTNOSUPPORT; - if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt))) + if (sk_is_refcounted(sk) && + unlikely(!refcount_inc_not_zero(&sk->sk_refcnt))) return -ENOENT; skb_orphan(skb); diff --git a/net/core/sock.c b/net/core/sock.c index 036ba43d044a..bcb7affcc1e0 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2071,7 +2071,8 @@ EXPORT_SYMBOL(sock_efree); #ifdef CONFIG_INET void sock_pfree(struct sk_buff *skb) { - sock_gen_put(skb->sk); + if (sk_is_refcounted(skb->sk)) + sock_gen_put(skb->sk); } EXPORT_SYMBOL(sock_pfree); #endif /* CONFIG_INET */