From: Paolo Abeni <pabeni@redhat.com>
To: Dmitry Safonov <dima@arista.com>,
David Ahern <dsahern@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
"David S. Miller" <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org,
Andy Lutomirski <luto@amacapital.net>,
Ard Biesheuvel <ardb@kernel.org>,
Bob Gilligan <gilligan@arista.com>,
Dan Carpenter <error27@gmail.com>,
David Laight <David.Laight@aculab.com>,
Dmitry Safonov <0x7f454c46@gmail.com>,
Donald Cassidy <dcassidy@redhat.com>,
Eric Biggers <ebiggers@kernel.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Francesco Ruggeri <fruggeri05@gmail.com>,
"Gaillardetz, Dominik" <dgaillar@ciena.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Ivan Delalande <colona@arista.com>,
Leonard Crestez <cdleonard@gmail.com>,
"Nassiri, Mohammad" <mnassiri@ciena.com>,
Salam Noureddine <noureddine@arista.com>,
Simon Horman <simon.horman@corigine.com>,
"Tetreault, Francois" <ftetreau@ciena.com>,
netdev@vger.kernel.org
Subject: Re: [PATCH v12 net-next 06/23] net/tcp: Add TCP-AO sign to outgoing packets
Date: Thu, 21 Sep 2023 13:23:59 +0200 [thread overview]
Message-ID: <c2c0b0684b9c2a930ae6001bcc0044dd7a0862d5.camel@redhat.com> (raw)
In-Reply-To: <20230918190027.613430-7-dima@arista.com>
On Mon, 2023-09-18 at 20:00 +0100, Dmitry Safonov wrote:
> @@ -1361,16 +1385,48 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,
> th->window = htons(min(tp->rcv_wnd, 65535U));
> }
>
> - tcp_options_write(th, tp, &opts);
> + tcp_options_write(th, tp, &opts, &key);
>
> + if (tcp_key_is_md5(&key)) {
> #ifdef CONFIG_TCP_MD5SIG
> - /* Calculate the MD5 hash, as we have all we need now */
> - if (md5) {
> + /* Calculate the MD5 hash, as we have all we need now */
> sk_gso_disable(sk);
> tp->af_specific->calc_md5_hash(opts.hash_location,
> - md5, sk, skb);
> - }
> + key.md5_key, sk, skb);
> #endif
> + } else if (tcp_key_is_ao(&key)) {
> +#ifdef CONFIG_TCP_AO
> + struct tcp_ao_info *ao;
> + void *tkey_buf = NULL;
> + u8 *traffic_key;
> + __be32 disn;
> +
> + ao = rcu_dereference_protected(tcp_sk(sk)->ao_info,
> + lockdep_sock_is_held(sk));
> + if (unlikely(tcb->tcp_flags & TCPHDR_SYN)) {
> + if (tcb->tcp_flags & TCPHDR_ACK)
> + disn = ao->risn;
> + else
> + disn = 0;
> +
> + tkey_buf = kmalloc(tcp_ao_digest_size(key.ao_key),
> + GFP_ATOMIC);
> + if (!tkey_buf) {
> + kfree_skb_reason(skb, SKB_DROP_REASON_NOMEM);
> + return -ENOMEM;
> + }
> + traffic_key = tkey_buf;
> + tp->af_specific->ao_calc_key_sk(key.ao_key, traffic_key,
> + sk, ao->lisn, disn, true);
> + } else {
> + traffic_key = snd_other_key(key.ao_key);
> + }
> + tp->af_specific->calc_ao_hash(opts.hash_location, key.ao_key,
> + sk, skb, traffic_key,
> + opts.hash_location - (u8 *)th, 0);
> + kfree(tkey_buf);
> +#endif
I'm sorry for the incremental feedback.
The above could possibly deserve being moved to a specific helper, for
both readability and code locality when TCP_AO is enabled at compile
time but not used.
Cheers,
Paolo
next prev parent reply other threads:[~2023-09-21 20:26 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-18 18:59 [PATCH v12 net-next 00/23] net/tcp: Add TCP-AO support Dmitry Safonov
2023-09-18 18:59 ` [PATCH v12 net-next 01/23] net/tcp: Prepare tcp_md5sig_pool for TCP-AO Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 02/23] net/tcp: Add TCP-AO config and structures Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 03/23] net/tcp: Introduce TCP_AO setsockopt()s Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 04/23] net/tcp: Prevent TCP-MD5 with TCP-AO being set Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 05/23] net/tcp: Calculate TCP-AO traffic keys Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 06/23] net/tcp: Add TCP-AO sign to outgoing packets Dmitry Safonov
2023-09-21 11:20 ` Paolo Abeni
2023-09-21 16:01 ` Dmitry Safonov
2023-09-21 11:23 ` Paolo Abeni [this message]
2023-09-21 16:03 ` Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 07/23] net/tcp: Add tcp_parse_auth_options() Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 08/23] net/tcp: Add AO sign to RST packets Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 09/23] net/tcp: Add TCP-AO sign to twsk Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 10/23] net/tcp: Wire TCP-AO to request sockets Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 11/23] net/tcp: Sign SYN-ACK segments with TCP-AO Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 12/23] net/tcp: Verify inbound TCP-AO signed segments Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 13/23] net/tcp: Add TCP-AO segments counters Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 14/23] net/tcp: Add TCP-AO SNE support Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 15/23] net/tcp: Add tcp_hash_fail() ratelimited logs Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 16/23] net/tcp: Ignore specific ICMPs for TCP-AO connections Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 17/23] net/tcp: Add option for TCP-AO to (not) hash header Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 18/23] net/tcp: Add TCP-AO getsockopt()s Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 19/23] net/tcp: Allow asynchronous delete for TCP-AO keys (MKTs) Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 20/23] net/tcp: Add static_key for TCP-AO Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 21/23] net/tcp: Wire up l3index to TCP-AO Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 22/23] net/tcp: Add TCP_AO_REPAIR Dmitry Safonov
2023-09-18 19:00 ` [PATCH v12 net-next 23/23] Documentation/tcp: Add TCP-AO documentation Dmitry Safonov
2023-09-21 16:49 ` [PATCH v12 net-next 00/23] net/tcp: Add TCP-AO support Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c2c0b0684b9c2a930ae6001bcc0044dd7a0862d5.camel@redhat.com \
--to=pabeni@redhat.com \
--cc=0x7f454c46@gmail.com \
--cc=David.Laight@aculab.com \
--cc=ardb@kernel.org \
--cc=cdleonard@gmail.com \
--cc=colona@arista.com \
--cc=davem@davemloft.net \
--cc=dcassidy@redhat.com \
--cc=dgaillar@ciena.com \
--cc=dima@arista.com \
--cc=dsahern@kernel.org \
--cc=ebiederm@xmission.com \
--cc=ebiggers@kernel.org \
--cc=edumazet@google.com \
--cc=error27@gmail.com \
--cc=fruggeri05@gmail.com \
--cc=ftetreau@ciena.com \
--cc=gilligan@arista.com \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mnassiri@ciena.com \
--cc=netdev@vger.kernel.org \
--cc=noureddine@arista.com \
--cc=simon.horman@corigine.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®