From patchwork Wed Jun 14 23:09:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 108179 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp283183vqr; Wed, 14 Jun 2023 16:18:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ52JJT7xOLwkwp7+HpJnX/kNciFFKWMgLD+Bi3lzbVfXtCz8DbdQdsYDobKmrb4MomnvJV9 X-Received: by 2002:a05:6a00:1a4a:b0:63b:8a91:e641 with SMTP id h10-20020a056a001a4a00b0063b8a91e641mr3822723pfv.11.1686784730191; Wed, 14 Jun 2023 16:18:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686784730; cv=none; d=google.com; s=arc-20160816; b=ZoAbBy43nhUrEvNZl4mtjmMWj4YnjUVgskPotI1N+1Aaf2J7IegWhubLnx+4jKN1EH iCoAIdBATl3Lip+1i+YV8u2LDohY7VP4gJSDRAClmsQOPygU9onRldoNMplu0OwMfQBi GS8AQ3nIIhfwDQ0L7nAABFMIE/RL/csyeAQe3MG57K0trmNO22zPXxCemIYavtT4EBNc ptC4RLURBRZ7dM5emKHOvej7PQuENQY1xPajTjaWF6+z8CaWqC0TxSEUST5UMzIFzX2h +qvU9CoCW0meLFTqukkzoB0cXdQCW1XnHlV6db44BrKXQ6WbMxbHU2tltTIrFBmSLLiB b3ow== 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=nEfh4EMCc4IqGl/BAj96gbhPEjHc5nbwj1sO374I1UA=; b=DlpY9/YEfzJwKLgPpVFQVuA29HZeizr7eCYZDK48p4cAFHgfeF1Nqr4lUpZsm6tIpO M5G/qw7mneLhn4pYbyp4pAalir5ZpVnMFGqq/WwTtYkxBn0zlEHgnA9MyLqq01N9P+E2 PE2cInek5p0orPX7wM9wCma1NooHfIcrtlwCACjucHsAGYciDSp1r4BhjTOTAL5DFyx7 dinDZgr3V8uJ5WVZJxOM/Hyjfsz4hLi7LMf4DgrPZ1p0WWLcCwpyyoA4Y+IRjzmV3dGb i85sp2DJSa7VdHs04chMQTRbQ7RjQrX+c9+uDrlXI0BAcpeRXFpBFVNLcFtoXCV54ARx WEzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@arista.com header.s=google header.b=K1WZl6oL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=arista.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t184-20020a6381c1000000b0054fd670e85csi2191656pgd.643.2023.06.14.16.18.37; Wed, 14 Jun 2023 16:18:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@arista.com header.s=google header.b=K1WZl6oL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=arista.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238124AbjFNXLm (ORCPT + 99 others); Wed, 14 Jun 2023 19:11:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236795AbjFNXK7 (ORCPT ); Wed, 14 Jun 2023 19:10:59 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E2A32964 for ; Wed, 14 Jun 2023 16:10:19 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f7368126a6so11091635e9.0 for ; Wed, 14 Jun 2023 16:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; t=1686784217; x=1689376217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nEfh4EMCc4IqGl/BAj96gbhPEjHc5nbwj1sO374I1UA=; b=K1WZl6oLNfkdEChs+Ovrq1V9Cm05mE6kgCk0LxvIhTdhfsjWCKMAjISSuVS6TUgu5r TQKF+5KCfIZzDtnfDvmEWNDAKTHdKz3GCA/Cf5PjZW5a6kf97LgI2yafsyXJcI2SEjUv q3/+vdDRoqTV87UmCUSVwkeprW3lklAaJoJPAsx1pN3S4JJ24ttTNlCuSJuNzCxE/P8V ecmIPEUyIpBvcBIrD0u+dgoAkmulGRaY56DlkDyD9idkAyh8jJgjKrpeouJJCfWUECdP siuFN6ZKBQEX/NfrsVdY6UR/QQdfs/5BTt+RBv5QrW/MqqhMC3aUS/kHpnF+aBXJ4/Cc cGdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686784217; x=1689376217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nEfh4EMCc4IqGl/BAj96gbhPEjHc5nbwj1sO374I1UA=; b=HH11PPqIMJsVNz/hkmyYket49OerLmIwNg0EXj7duxM7rGh8++IVHIienIvfmisxYo MWNp0Lj8XItmtzCrhREZUlMKYONMzPwoMZ9io3Pxzm8P4/lFYA/TeuE2JYijXlpPOnR6 rhCrtmK2OWqNzSlOs5lx9Q6Lmf8/kA6qvK1oJ6VpApq1ciJyIyq9Ga4QoKGQCdQL39G5 t25xYOpx4RDFiHHEA2oxhMkgvts3R0Xmmx9EKWUBBW4J8B5zK00cqBLfP2GG6lgKNoMU seePinTKFCBRVjhE2HtzkGdVwT87FgHyBgeDSqQCjjiUxQx/lb420/wAFkPZ7k1AcIqc aUTQ== X-Gm-Message-State: AC+VfDz2Z+c0ENYLhubC8kOapF+NMPWMzN7vBcmUFDWfkto/5OezuTAT mhj/1TK5PTmvrxRtcwaIdYVgoTkJuMq+Br05fBc= X-Received: by 2002:a5d:5909:0:b0:30f:cdde:5ded with SMTP id v9-20020a5d5909000000b0030fcdde5dedmr4403746wrd.48.1686784217447; Wed, 14 Jun 2023 16:10:17 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id s12-20020a7bc38c000000b003f7ba52eeccsm18725261wmj.7.2023.06.14.16.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 16:10:17 -0700 (PDT) From: Dmitry Safonov To: David Ahern , Eric Dumazet , Paolo Abeni , Jakub Kicinski , "David S. Miller" Cc: linux-kernel@vger.kernel.org, Dmitry Safonov , Andy Lutomirski , Ard Biesheuvel , Bob Gilligan , Dan Carpenter , David Laight , Dmitry Safonov <0x7f454c46@gmail.com>, Donald Cassidy , Eric Biggers , "Eric W. Biederman" , Francesco Ruggeri , Herbert Xu , Hideaki YOSHIFUJI , Ivan Delalande , Leonard Crestez , Salam Noureddine , netdev@vger.kernel.org Subject: [PATCH v7 14/22] net/tcp: Add TCP-AO SNE support Date: Thu, 15 Jun 2023 00:09:39 +0100 Message-Id: <20230614230947.3954084-15-dima@arista.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230614230947.3954084-1-dima@arista.com> References: <20230614230947.3954084-1-dima@arista.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768721985558117402?= X-GMAIL-MSGID: =?utf-8?q?1768721985558117402?= Add Sequence Number Extension (SNE) for TCP-AO. This is needed to protect long-living TCP-AO connections from replaying attacks after sequence number roll-over, see RFC5925 (6.2). Co-developed-by: Francesco Ruggeri Signed-off-by: Francesco Ruggeri Co-developed-by: Salam Noureddine Signed-off-by: Salam Noureddine Signed-off-by: Dmitry Safonov --- net/ipv4/tcp_input.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 9e0a3dd9e9e0..eed3f7631b4b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3528,9 +3528,21 @@ static inline bool tcp_may_update_window(const struct tcp_sock *tp, static void tcp_snd_una_update(struct tcp_sock *tp, u32 ack) { u32 delta = ack - tp->snd_una; +#ifdef CONFIG_TCP_AO + struct tcp_ao_info *ao; +#endif sock_owned_by_me((struct sock *)tp); tp->bytes_acked += delta; +#ifdef CONFIG_TCP_AO + ao = rcu_dereference_protected(tp->ao_info, + lockdep_sock_is_held((struct sock *)tp)); + if (ao) { + if (ack < ao->snd_sne_seq) + ao->snd_sne++; + ao->snd_sne_seq = ack; + } +#endif tp->snd_una = ack; } @@ -3538,9 +3550,21 @@ static void tcp_snd_una_update(struct tcp_sock *tp, u32 ack) static void tcp_rcv_nxt_update(struct tcp_sock *tp, u32 seq) { u32 delta = seq - tp->rcv_nxt; +#ifdef CONFIG_TCP_AO + struct tcp_ao_info *ao; +#endif sock_owned_by_me((struct sock *)tp); tp->bytes_received += delta; +#ifdef CONFIG_TCP_AO + ao = rcu_dereference_protected(tp->ao_info, + lockdep_sock_is_held((struct sock *)tp)); + if (ao) { + if (seq < ao->rcv_sne_seq) + ao->rcv_sne++; + ao->rcv_sne_seq = seq; + } +#endif WRITE_ONCE(tp->rcv_nxt, seq); } @@ -6371,6 +6395,17 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, * simultaneous connect with crossed SYNs. * Particularly, it can be connect to self. */ +#ifdef CONFIG_TCP_AO + struct tcp_ao_info *ao; + + ao = rcu_dereference_protected(tp->ao_info, + lockdep_sock_is_held(sk)); + if (ao) { + ao->risn = th->seq; + ao->rcv_sne = 0; + ao->rcv_sne_seq = ntohl(th->seq); + } +#endif tcp_set_state(sk, TCP_SYN_RECV); if (tp->rx_opt.saw_tstamp) {