From patchwork Wed May 10 15:22:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Mikhalitsyn X-Patchwork-Id: 13237015 X-Patchwork-Delegate: bpf@iogearbox.net Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 967A514A83 for ; Wed, 10 May 2023 15:23:39 +0000 (UTC) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 977172D66 for ; Wed, 10 May 2023 08:23:37 -0700 (PDT) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 202953F32E for ; Wed, 10 May 2023 15:23:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1683732214; bh=nxt1AjdlyoqIrH6J1U3hreWGYLSAQKMD95fnrL6guHQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Wwpzi5ltnPGzZCeZv8CUgPo4l7Xkbz5K2HP80PDBYNRBc8mqbjrPx8+gZi6+NIg62 tX+xQ940WGIMYJWVb0OG2CFN5Qo+xTO4S+BiyYAOvM20QhYf8F099tRUMYBnREC07f Ue/hoM2IGd8PUHr9cnL51a1YaoGBJJ94mc2+IG7haUnxXaGRUlXmunzL7ApjgTyhik hcSe6J+YqPDeb+ItnI7n8Ue5rB4fDIBM26BQ5Ff5i8lc3MaHcyKsAramzIZUp58OGP 91FO/dT9ekJ9JJ4OwNHRlpQWLTC9nir1dL4L2O6U8P0nYCfE4UTNObLO/E3wEl5iLu qqWkbvvTER9Cw== Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-94a34a0b75eso682407266b.1 for ; Wed, 10 May 2023 08:23:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683732213; x=1686324213; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nxt1AjdlyoqIrH6J1U3hreWGYLSAQKMD95fnrL6guHQ=; b=F2K8cV+TiK+hSy8bcl2PLGG8IAhp9RdUqnTchP7N5ifGsZpwA1CkZvuOrJJutku6DV 5urybFwbqpC68z0rUTZHefrYLJiB8uz2SC09zXYWpVzyoEikDSrBmSdwdpmcdRSWoDsZ 0kwlJEJoHa/sj3HRDfkk7Cpz+M0Sv5hXZomqFpJT7q2JGgG/gUfpNMF4J5gZS8ZwlHDw RvycEeNjyAx2YnbH6pCHBW1G8ydgh61/zWXf+sqa1OctTc5LjWnGwMTXCRqAL8+YLnPf H4ZjKafLJGzigPDIeJsZUv2TeyKToZFB5rfFEj72OumiVtcFe5dsV8qe9GGPTMCuOjsO SEKA== X-Gm-Message-State: AC+VfDxVvkTUwODliWcro0EmgMQ4+6mRTXfND+02p65cJ1qMxWWDLBAe j04ho8dFzxpc0DexJO+3FjrsfwDDfoC4mabAQimPerUbPX/MCtrSx1hlB7Tgenl0i/ti5GzHt+g BuNYk5qDQ6NaIEEVRkxilArZeLhQsy9ueKA== X-Received: by 2002:a17:907:6295:b0:94e:cbfb:5fab with SMTP id nd21-20020a170907629500b0094ecbfb5fabmr16778388ejc.75.1683732213533; Wed, 10 May 2023 08:23:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7wVCdAKwUlJ8V9lcgbWEAiwFeSNH6AK2FonknQiPTYHWcs8YvzVYyw9uHkDEkxON4bz52OSg== X-Received: by 2002:a17:907:6295:b0:94e:cbfb:5fab with SMTP id nd21-20020a170907629500b0094ecbfb5fabmr16778362ejc.75.1683732213215; Wed, 10 May 2023 08:23:33 -0700 (PDT) Received: from amikhalitsyn.. (ip5f5bf3d5.dynamic.kabel-deutschland.de. [95.91.243.213]) by smtp.gmail.com with ESMTPSA id kn3-20020a1709079b0300b0096a27dbb5b2sm902755ejc.209.2023.05.10.08.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 May 2023 08:23:32 -0700 (PDT) From: Alexander Mikhalitsyn To: davem@davemloft.net Cc: Alexander Mikhalitsyn , Alexei Starovoitov , Daniel Borkmann , Christian Brauner , Stanislav Fomichev , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Kuniyuki Iwashima , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH net-next] net: core: add SOL_SOCKET filter for bpf getsockopt hook Date: Wed, 10 May 2023 17:22:16 +0200 Message-Id: <20230510152216.1392682-1-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org We have per struct proto ->bpf_bypass_getsockopt callback to filter out bpf socket cgroup getsockopt hook from being called. It seems worthwhile to add analogical helper for SOL_SOCKET level socket options. First user will be SO_PEERPIDFD. This patch was born as a result of discussion around a new SCM_PIDFD interface: https://lore.kernel.org/all/20230413133355.350571-3-aleksandr.mikhalitsyn@canonical.com/ Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Christian Brauner Cc: Stanislav Fomichev Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Kuniyuki Iwashima Cc: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org Cc: bpf@vger.kernel.org Signed-off-by: Alexander Mikhalitsyn --- include/linux/bpf-cgroup.h | 8 +++++--- include/net/sock.h | 1 + net/core/sock.c | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index 57e9e109257e..97d8a49b35bf 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -387,10 +387,12 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk, int __ret = retval; \ if (cgroup_bpf_enabled(CGROUP_GETSOCKOPT) && \ cgroup_bpf_sock_enabled(sock, CGROUP_GETSOCKOPT)) \ - if (!(sock)->sk_prot->bpf_bypass_getsockopt || \ - !INDIRECT_CALL_INET_1((sock)->sk_prot->bpf_bypass_getsockopt, \ + if (((level != SOL_SOCKET) || \ + !sock_bpf_bypass_getsockopt(level, optname)) && \ + (!(sock)->sk_prot->bpf_bypass_getsockopt || \ + !INDIRECT_CALL_INET_1((sock)->sk_prot->bpf_bypass_getsockopt, \ tcp_bpf_bypass_getsockopt, \ - level, optname)) \ + level, optname))) \ __ret = __cgroup_bpf_run_filter_getsockopt( \ sock, level, optname, optval, optlen, \ max_optlen, retval); \ diff --git a/include/net/sock.h b/include/net/sock.h index 8b7ed7167243..530d6d22f42d 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1847,6 +1847,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname, sockptr_t optval, sockptr_t optlen); int sock_getsockopt(struct socket *sock, int level, int op, char __user *optval, int __user *optlen); +bool sock_bpf_bypass_getsockopt(int level, int optname); int sock_gettstamp(struct socket *sock, void __user *userstamp, bool timeval, bool time32); struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, diff --git a/net/core/sock.c b/net/core/sock.c index 5440e67bcfe3..194a423eb6e5 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1963,6 +1963,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname, USER_SOCKPTR(optlen)); } +bool sock_bpf_bypass_getsockopt(int level, int optname) +{ + return false; +} + /* * Initialize an sk_lock. *