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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68FB1C433EF for ; Sun, 27 Feb 2022 20:28:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231660AbiB0U2n (ORCPT ); Sun, 27 Feb 2022 15:28:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231583AbiB0U2j (ORCPT ); Sun, 27 Feb 2022 15:28:39 -0500 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 437AE42EC5 for ; Sun, 27 Feb 2022 12:28:02 -0800 (PST) Received: by mail-lj1-x229.google.com with SMTP id r20so14765052ljj.1 for ; Sun, 27 Feb 2022 12:28:02 -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=HcX6QIHBexFnM7/ZWxha4rDjE47zmHJGP0UcfZC2560=; b=gQM/q0fzcSYIYJwkT6qKUzrvOnhj6iEMs1hQslqLe2dTX9YJYPMnRWZGmTAOC81AY4 P8uUQeg8i3ZJB+sbbE2MzJTBW6VaLFR0ENEo7NIIokXgXSZtdXOnyzCZWwfUkCXEa2jZ TCT82eigO2QEJ6IfY4RJowpGjORFLNEivi6n0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HcX6QIHBexFnM7/ZWxha4rDjE47zmHJGP0UcfZC2560=; b=cPeDBUB6cgO9++udjYVmUTZNeYrEL6Cs1AEZvRJp/DTBIv8k1Mi+DRYbOnAoM6Whaq F1EKSdiEN7U4lMA8+GXA21XloN7aLatZqYt5pIgeQEDvfYGtXvj8f62Km4SAh6LhSpT7 mCacGSmQNyw7Jz+2gX8gXw9diZut9+caKKXSq0WPD0RwDXBu+PZbCZuQsxs8E/aklH2T GcbVOsxJsJEZDajbzabPSMIBldUEBCwEYsL8oICPAyvAqnD8QJPt3CFAoQftdY40ozqZ EXvi61QPVL7/r6YRxRU4sQ06RpzpZap/2jEAcF12sY+7AtvgLiBhBnlr++Whnr+tdIL9 J6cw== X-Gm-Message-State: AOAM532nswC6T6+XDZcjrtpzkbl7dzboC9d1M86h1uOgnGuZ7XF/yLVF De6ffRd9O/kj+snUZYZRcUdLHOyf1kQiDw== X-Google-Smtp-Source: ABdhPJx1y59iwtFIH2K6sqVTbgJgt53EYQL4uaLHm0VMbPbdlpoOAOwVJdKfcgDCC5773pUt00AnKg== X-Received: by 2002:a2e:94c:0:b0:246:3922:7bec with SMTP id 73-20020a2e094c000000b0024639227becmr12247514ljj.430.1645993680246; Sun, 27 Feb 2022 12:28:00 -0800 (PST) Received: from cloudflare.com (2a01-110f-4809-d800-0000-0000-0000-0f9c.aa.ipv6.supernova.orange.pl. [2a01:110f:4809:d800::f9c]) by smtp.gmail.com with ESMTPSA id 22-20020a05651c009600b002447ce4b34esm1034472ljq.116.2022.02.27.12.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Feb 2022 12:27:59 -0800 (PST) From: Jakub Sitnicki To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , kernel-team@cloudflare.com, Martin KaFai Lau , Ilya Leoshkevich Subject: [PATCH bpf-next v2 2/3] selftests/bpf: Check dst_port only on the client socket Date: Sun, 27 Feb 2022 21:27:56 +0100 Message-Id: <20220227202757.519015-3-jakub@cloudflare.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220227202757.519015-1-jakub@cloudflare.com> References: <20220227202757.519015-1-jakub@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org cgroup_skb/egress programs which sock_fields test installs process packets flying in both directions, from the client to the server, and in reverse direction. Recently added dst_port check relies on the fact that destination port (remote peer port) of the socket which sends the packet is known ahead of time. This holds true only for the client socket, which connects to the known server port. Filter out any traffic that is not bound to be egressing from the client socket in the test program for reading the dst_port. Fixes: 8f50f16ff39d ("selftests/bpf: Extend verifier and bpf_sock tests for dst_port loads") Signed-off-by: Jakub Sitnicki --- .../testing/selftests/bpf/progs/test_sock_fields.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/test_sock_fields.c b/tools/testing/selftests/bpf/progs/test_sock_fields.c index 3e2e3ee51cc9..186fed1deaab 100644 --- a/tools/testing/selftests/bpf/progs/test_sock_fields.c +++ b/tools/testing/selftests/bpf/progs/test_sock_fields.c @@ -42,6 +42,11 @@ struct { __type(value, struct bpf_spinlock_cnt); } sk_pkt_out_cnt10 SEC(".maps"); +enum { + TCP_SYN_SENT = 2, + TCP_LISTEN = 10, +}; + struct bpf_tcp_sock listen_tp = {}; struct sockaddr_in6 srv_sa6 = {}; struct bpf_tcp_sock cli_tp = {}; @@ -138,7 +143,7 @@ int egress_read_sock_fields(struct __sk_buff *skb) * TCP_LISTEN (10) socket will be copied at the ingress side. */ if (sk->family != AF_INET6 || !is_loopback6(sk->src_ip6) || - sk->state == 10) + sk->state == TCP_LISTEN) return CG_OK; if (sk->src_port == bpf_ntohs(srv_sa6.sin6_port)) { @@ -233,7 +238,7 @@ int ingress_read_sock_fields(struct __sk_buff *skb) return CG_OK; /* Only interested in TCP_LISTEN */ - if (sk->state != 10) + if (sk->state != TCP_LISTEN) return CG_OK; /* It must be a fullsock for cgroup_skb/ingress prog */ @@ -281,6 +286,10 @@ int read_sk_dst_port(struct __sk_buff *skb) if (!sk) RET_LOG(); + /* Ignore everything but the SYN from the client socket */ + if (sk->state != TCP_SYN_SENT) + return CG_OK; + if (!sk_dst_port__load_word(sk)) RET_LOG(); if (!sk_dst_port__load_half(sk)) -- 2.35.1