From patchwork Wed Aug 2 17:26:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 130025 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp626793vqx; Wed, 2 Aug 2023 10:53:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlH0EUB7C8Orrp1Rute6q5MNC6LsVOY1nH7+mnyUs/5bmH3Zk09vtK8wHWaPgjtRmAiYvgAp X-Received: by 2002:a17:903:228f:b0:1b9:be2e:2b40 with SMTP id b15-20020a170903228f00b001b9be2e2b40mr20494347plh.50.1690998794770; Wed, 02 Aug 2023 10:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690998794; cv=none; d=google.com; s=arc-20160816; b=lrH0YbbyX29B2/3k11Y04qkFXO6bursQvE+1FLyxlu/9UpcFkMFwol0/pWrLeix5DQ A5U4i9Z5+Go4O5xsbWPKCXlbPLRAtuAec9CkuUE+ahw0FReCQQeK9PsxgTUu8VpppqgC w4qcMauDdQhfSiK7rdhpp6F4HunhmuNfoW2eocpqBypqzFUR+/s9+2RlSMGV/TRCkXB5 pz7oBlbUCCUvXYBGd5k3pq6UFIMzbqHaZD8+dazdJJyyl0grfWxO3Mei01YuL5dCMLpF FkFLEI18WWbAHZpeaBCLhsVbEKJFR4joaRO+dUAm+Tf62nO32fRWM64jl6Knuqqcf01c yhkA== 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=GkQe/nCDfwBSo6ISivw2NURmxZ6yA0FTUkbJtQ8Icck=; fh=+1v2wpWL3SwC67MevmNFbsOkJ0jlpe0KMhkxFTuop+s=; b=f1trYmr5vplqs6SgcMr9vliaS/Ao9S7BIyiOH5MbdCqDBUeGUWZUIERa/jwUfPQirG bqlwbz4w02KR9d0dM6RfjDNbPQg5/rt5cyDy2pIUBFTkYfcUp7BzcW71EPwkmyUJiCeX iIkYVxCwtnwPjPewkSnodAUiFcjOmHjsV6gbM/M5YtOcI9Uot/lOXBnG9AD5OgEU6hP0 LLFUhBFTpsjXnWVD0Q4ZXcFUAsXSv0ioCQkjww65MjarU1Wf3taxNW3QXsRiHx66K8fj PVe3WHguQf12q93chtfaQJVugctg5NAZUuicPqoRoNm57ETkz7J/pIomi0sLtaWuooNk 7k9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@arista.com header.s=google header.b=AxQcP423; 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 jc9-20020a17090325c900b001b8bab3d5dasi10436114plb.108.2023.08.02.10.53.01; Wed, 02 Aug 2023 10:53:14 -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=AxQcP423; 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 S233049AbjHBR1y (ORCPT + 99 others); Wed, 2 Aug 2023 13:27:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232740AbjHBR12 (ORCPT ); Wed, 2 Aug 2023 13:27:28 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B996E2D73 for ; Wed, 2 Aug 2023 10:27:08 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3fe12820bffso990915e9.3 for ; Wed, 02 Aug 2023 10:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; t=1690997226; x=1691602026; 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=GkQe/nCDfwBSo6ISivw2NURmxZ6yA0FTUkbJtQ8Icck=; b=AxQcP423U+4yJTBlKtF1ulTxO3fEqvO3+WPKbXjTRdG8jXdDfSbV1ofeQO4GVYVjb9 8zDdYBVBybF79v5EqJLrsqRyD/cAKyhdyxtoldZMx2dBjR3Wx5cQxZDEbYCvAOa8powI GI3a1+JqgmSDQZw9bnvE7p9U8DO0XKeVZZluDFNeJV2rynkgD3qIlY8jEE+LHPzlDuwO 2ZG/mNwQLoc+y2IIXTrFe73CPj/r5VOKgtl7ESdpy4Xr2YrPamFy8X/3ComKEUQDshQd 7gNJ18BxLSxc8oCUG04MMjnNPeFoJlaCjM66DtOvyAX1cwTfDlKGN9VbJZAIHLi8HLoZ pK0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690997226; x=1691602026; 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=GkQe/nCDfwBSo6ISivw2NURmxZ6yA0FTUkbJtQ8Icck=; b=VcPcSbGuOrFA11UooqniqIkGc4n6aEM8YDiLeMlXkZdh3HGcexROOvO/kCxrpexQsv KmCgTX96F5hOUo/N+gYMWJ6A9FZzHXYQntHW0+V3JOt82C5N+xjrJ29j+TUJlWinLq4u TPPdDhjeH8kP2MyLuTfh6c3vdrgJdgo05qpqy8RF0L6HO3Ix3iCVjPsil2CZ4LQZqw+9 gYiBpQ/YRjvP0bVs6DtBdJ5JweGX8h1GQyP0pDzMA3DW0Fc9qtp3eNatQKzHYSpA6WBA SzbdCOWpm6PblCNWaICMVTqRv062yqjuKC6MgF846eQkZPja46Fh+/ZOD6q+YOnZF6La kGTQ== X-Gm-Message-State: ABy/qLbVm7WgLCrNCbC1QguDSm4eHrDc5M4mtkYQfiAttMHNg2XCyOuT 60yQeOYHCf9Izgt0tTMt1P1OZA== X-Received: by 2002:a05:600c:219a:b0:3fe:1dad:5403 with SMTP id e26-20020a05600c219a00b003fe1dad5403mr5012272wme.23.1690997226511; Wed, 02 Aug 2023 10:27:06 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id q5-20020a1ce905000000b003fbc0a49b57sm2221770wmc.6.2023.08.02.10.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 10:27:05 -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 , "Gaillardetz, Dominik" , Herbert Xu , Hideaki YOSHIFUJI , Ivan Delalande , Leonard Crestez , Salam Noureddine , "Tetreault, Francois" , netdev@vger.kernel.org Subject: [PATCH v9 net-next 02/23] net/tcp: Add TCP-AO config and structures Date: Wed, 2 Aug 2023 18:26:29 +0100 Message-ID: <20230802172654.1467777-3-dima@arista.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230802172654.1467777-1-dima@arista.com> References: <20230802172654.1467777-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_BLOCKED,SPF_HELO_NONE,SPF_NONE,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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773140752734259412 X-GMAIL-MSGID: 1773140752734259412 Introduce new kernel config option and common structures as well as helpers to be used by TCP-AO code. 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 Acked-by: David Ahern --- include/linux/tcp.h | 9 +++- include/net/tcp.h | 8 +--- include/net/tcp_ao.h | 90 ++++++++++++++++++++++++++++++++++++++++ include/uapi/linux/tcp.h | 2 + net/ipv4/Kconfig | 13 ++++++ 5 files changed, 114 insertions(+), 8 deletions(-) create mode 100644 include/net/tcp_ao.h diff --git a/include/linux/tcp.h b/include/linux/tcp.h index d16abdb3541a..9eb15e798c32 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -437,13 +437,18 @@ struct tcp_sock { bool syn_smc; /* SYN includes SMC */ #endif -#ifdef CONFIG_TCP_MD5SIG -/* TCP AF-Specific parts; only used by MD5 Signature support so far */ +#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO) +/* TCP AF-Specific parts; only used by TCP-AO/MD5 Signature support so far */ const struct tcp_sock_af_ops *af_specific; +#ifdef CONFIG_TCP_MD5SIG /* TCP MD5 Signature Option information */ struct tcp_md5sig_info __rcu *md5sig_info; #endif +#ifdef CONFIG_TCP_AO + struct tcp_ao_info __rcu *ao_info; +#endif +#endif /* TCP fastopen related information */ struct tcp_fastopen_request *fastopen_req; diff --git a/include/net/tcp.h b/include/net/tcp.h index 506138e69643..9ea8fa4406de 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -1651,12 +1652,7 @@ static inline void tcp_clear_all_retrans_hints(struct tcp_sock *tp) tp->retransmit_skb_hint = NULL; } -union tcp_md5_addr { - struct in_addr a4; -#if IS_ENABLED(CONFIG_IPV6) - struct in6_addr a6; -#endif -}; +#define tcp_md5_addr tcp_ao_addr /* - key database */ struct tcp_md5sig_key { diff --git a/include/net/tcp_ao.h b/include/net/tcp_ao.h new file mode 100644 index 000000000000..af76e1c47bea --- /dev/null +++ b/include/net/tcp_ao.h @@ -0,0 +1,90 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _TCP_AO_H +#define _TCP_AO_H + +#define TCP_AO_KEY_ALIGN 1 +#define __tcp_ao_key_align __aligned(TCP_AO_KEY_ALIGN) + +union tcp_ao_addr { + struct in_addr a4; +#if IS_ENABLED(CONFIG_IPV6) + struct in6_addr a6; +#endif +}; + +struct tcp_ao_hdr { + u8 kind; + u8 length; + u8 keyid; + u8 rnext_keyid; +}; + +struct tcp_ao_key { + struct hlist_node node; + union tcp_ao_addr addr; + u8 key[TCP_AO_MAXKEYLEN] __tcp_ao_key_align; + unsigned int tcp_sigpool_id; + unsigned int digest_size; + u8 prefixlen; + u8 family; + u8 keylen; + u8 keyflags; + u8 sndid; + u8 rcvid; + u8 maclen; + struct rcu_head rcu; + u8 traffic_keys[]; +}; + +static inline u8 *rcv_other_key(struct tcp_ao_key *key) +{ + return key->traffic_keys; +} + +static inline u8 *snd_other_key(struct tcp_ao_key *key) +{ + return key->traffic_keys + key->digest_size; +} + +static inline int tcp_ao_maclen(const struct tcp_ao_key *key) +{ + return key->maclen; +} + +static inline int tcp_ao_len(const struct tcp_ao_key *key) +{ + return tcp_ao_maclen(key) + sizeof(struct tcp_ao_hdr); +} + +static inline unsigned int tcp_ao_digest_size(struct tcp_ao_key *key) +{ + return key->digest_size; +} + +static inline int tcp_ao_sizeof_key(const struct tcp_ao_key *key) +{ + return sizeof(struct tcp_ao_key) + (key->digest_size << 1); +} + +struct tcp_ao_info { + /* List of tcp_ao_key's */ + struct hlist_head head; + /* current_key and rnext_key aren't maintained on listen sockets. + * Their purpose is to cache keys on established connections, + * saving needless lookups. Never dereference any of them from + * listen sockets. + * ::current_key may change in RX to the key that was requested by + * the peer, please use READ_ONCE()/WRITE_ONCE() in order to avoid + * load/store tearing. + * Do the same for ::rnext_key, if you don't hold socket lock + * (it's changed only by userspace request in setsockopt()). + */ + struct tcp_ao_key *current_key; + struct tcp_ao_key *rnext_key; + u32 flags; + __be32 lisn; + __be32 risn; + struct rcu_head rcu; +}; + +#endif /* _TCP_AO_H */ diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index 879eeb0a084b..5655bfe28b8d 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -348,6 +348,8 @@ struct tcp_diag_md5sig { __u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN]; }; +#define TCP_AO_MAXKEYLEN 80 + /* setsockopt(fd, IPPROTO_TCP, TCP_ZEROCOPY_RECEIVE, ...) */ #define TCP_RECEIVE_ZEROCOPY_FLAG_TLB_CLEAN_HINT 0x1 diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 89e2ab023272..8e94ed7c56a0 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -744,6 +744,19 @@ config DEFAULT_TCP_CONG config TCP_SIGPOOL tristate +config TCP_AO + bool "TCP: Authentication Option (RFC5925)" + select CRYPTO + select TCP_SIGPOOL + depends on 64BIT && IPV6 != m # seq-number extension needs WRITE_ONCE(u64) + help + TCP-AO specifies the use of stronger Message Authentication Codes (MACs), + protects against replays for long-lived TCP connections, and + provides more details on the association of security with TCP + connections than TCP MD5 (See RFC5925) + + If unsure, say N. + config TCP_MD5SIG bool "TCP: MD5 Signature Option support (RFC2385)" select CRYPTO