[v12,net-next,00/23] net/tcp: Add TCP-AO support

Pull-request

[e-mail]:0x7f454c46/linux.git tcp-ao-v12

Message

Dmitry Safonov Sept. 18, 2023, 6:59 p.m. UTC

Hi,

This is version 12 of TCP-AO support. The changes from v11 address
Eric's review comments. The biggest change was defining a common
(struct tcp_key) that merges tcp_ao_key with tcp_md5sig_key on TCP
fast-path, therefore in order to help reviewing I provide
the ranged-diff between the versions here:

   https://gist.github.com/0x7f454c46/fe546b9cf323ca21acc3d0eabbd41236

There's one Sparse warning introduced by tcp_sigpool_start():
__cond_acquires() seems to currently being broken. I've described
the reasoning for it on v9 cover letter. Also, checkpatch.pl warnings
were addressed, but yet I've left the ones that are more personal
preferences (i.e. 80 columns limit). Please, ping me if you have
a strong feeling about one of them.

The following changes since commit a5ea26536e89d04485aa9e1c8f60ba11dfc5469e:

  Merge branch 'stmmac-devvm_stmmac_probe_config_dt-conversion' (2023-09-18 12:44:36 +0100)

are available in the Git repository at:

  [e-mail]:0x7f454c46/linux.git tcp-ao-v12

for you to fetch changes up to 45aa51f1d541b7ce961b379eb0f45031b89575d6:

  Documentation/tcp: Add TCP-AO documentation (2023-09-18 18:07:32 +0100)

----------------------------------------------------------------

And another branch with selftests, that will be sent later separately:
  [e-mail]:0x7f454c46/linux.git tcp-ao-v12-with-selftests

Thanks for your time and reviews,
         Dmitry

--- Changelog ---

Changes from v11:
- Define (struct tcp_key) for tcp-fast path and detect by type what key
  was used. This also benefits from TCP-MD5/TCP-AO static branches (Eric)
- Remove sk_gso_disable() from TCP-AO fast-path in __tcp_transmit_skb()
  (Eric)
- Don't leak skb on failed kmalloc() in __tcp_transmit_skb() (Eric)
- skb_dst_drop() is not necessary as kfree_skb() calls it (Eric)
- Don't dereference tcp_ao_key in net_warn_ratelimited(), outside of
  rcu_read_lock() (Eric)

Changes from v10:
- Make seq (u32) in tcp_ao_prepare_reset() and declare the argument
  in "net/tcp: Add TCP-AO SNE support", where it gets used (Simon)
- Fix rebase artifact in tcp_v6_reqsk_send_ack(), which adds
  compile-error on a patch in the middle of series (Simon)
- Another rebase artifact in tcp_v6_reqsk_send_ack() that makes
  keyid, requested by peer on ipv6 reqsk ACKs not respected (Simon)

Version 10: https://lore.kernel.org/all/[e-mail]/T/#u

The pre-v10 changelog is on version 10 cover-letter.

Cc: Andy Lutomirski <[e-mail]>
Cc: Ard Biesheuvel <[e-mail]>
Cc: Bob Gilligan <[e-mail]>
Cc: Dan Carpenter <[e-mail]>
Cc: David Ahern <[e-mail]>
Cc: David Laight <[e-mail]>
Cc: "David S. Miller" <[e-mail]>
Cc: Dmitry Safonov <[e-mail]>
Cc: Donald Cassidy <[e-mail]>
Cc: Eric Biggers <[e-mail]>
Cc: Eric Dumazet <[e-mail]>
Cc: "Eric W. Biederman" <[e-mail]>
Cc: Francesco Ruggeri <[e-mail]>
Cc: Gaillardetz, Dominik <[e-mail]>
Cc: Herbert Xu <[e-mail]>
Cc: Hideaki YOSHIFUJI <[e-mail]>
Cc: Ivan Delalande <[e-mail]>
Cc: Jakub Kicinski <[e-mail]>
Cc: Leonard Crestez <[e-mail]>
Cc: Nassiri, Mohammad <[e-mail]>
Cc: Paolo Abeni <[e-mail]>
Cc: Salam Noureddine <[e-mail]>
Cc: Simon Horman <[e-mail]>
Cc: Tetreault, Francois <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]

Dmitry Safonov (23):
  net/tcp: Prepare tcp_md5sig_pool for TCP-AO
  net/tcp: Add TCP-AO config and structures
  net/tcp: Introduce TCP_AO setsockopt()s
  net/tcp: Prevent TCP-MD5 with TCP-AO being set
  net/tcp: Calculate TCP-AO traffic keys
  net/tcp: Add TCP-AO sign to outgoing packets
  net/tcp: Add tcp_parse_auth_options()
  net/tcp: Add AO sign to RST packets
  net/tcp: Add TCP-AO sign to twsk
  net/tcp: Wire TCP-AO to request sockets
  net/tcp: Sign SYN-ACK segments with TCP-AO
  net/tcp: Verify inbound TCP-AO signed segments
  net/tcp: Add TCP-AO segments counters
  net/tcp: Add TCP-AO SNE support
  net/tcp: Add tcp_hash_fail() ratelimited logs
  net/tcp: Ignore specific ICMPs for TCP-AO connections
  net/tcp: Add option for TCP-AO to (not) hash header
  net/tcp: Add TCP-AO getsockopt()s
  net/tcp: Allow asynchronous delete for TCP-AO keys (MKTs)
  net/tcp: Add static_key for TCP-AO
  net/tcp: Wire up l3index to TCP-AO
  net/tcp: Add TCP_AO_REPAIR
  Documentation/tcp: Add TCP-AO documentation

 Documentation/networking/index.rst  |    1 +
 Documentation/networking/tcp_ao.rst |  434 +++++
 include/linux/sockptr.h             |   23 +
 include/linux/tcp.h                 |   30 +-
 include/net/dropreason-core.h       |   30 +
 include/net/tcp.h                   |  288 +++-
 include/net/tcp_ao.h                |  347 ++++
 include/uapi/linux/snmp.h           |    5 +
 include/uapi/linux/tcp.h            |  105 ++
 net/ipv4/Kconfig                    |   17 +
 net/ipv4/Makefile                   |    2 +
 net/ipv4/proc.c                     |    5 +
 net/ipv4/syncookies.c               |    4 +
 net/ipv4/tcp.c                      |  246 +--
 net/ipv4/tcp_ao.c                   | 2341 +++++++++++++++++++++++++++
 net/ipv4/tcp_input.c                |   97 +-
 net/ipv4/tcp_ipv4.c                 |  363 ++++-
 net/ipv4/tcp_minisocks.c            |   50 +-
 net/ipv4/tcp_output.c               |  263 ++-
 net/ipv4/tcp_sigpool.c              |  358 ++++
 net/ipv6/Makefile                   |    1 +
 net/ipv6/syncookies.c               |    5 +
 net/ipv6/tcp_ao.c                   |  168 ++
 net/ipv6/tcp_ipv6.c                 |  374 +++--
 24 files changed, 5122 insertions(+), 435 deletions(-)
 create mode 100644 Documentation/networking/tcp_ao.rst
 create mode 100644 include/net/tcp_ao.h
 create mode 100644 net/ipv4/tcp_ao.c
 create mode 100644 net/ipv4/tcp_sigpool.c
 create mode 100644 net/ipv6/tcp_ao.c


base-commit: a5ea26536e89d04485aa9e1c8f60ba11dfc5469e

Comments

Eric Dumazet Sept. 21, 2023, 4:49 p.m. UTC | #1

On Mon, Sep 18, 2023 at 9:00 PM Dmitry Safonov <[e-mail]> wrote:
>
> Hi,
>
> This is version 12 of TCP-AO support. The changes from v11 address
> Eric's review comments. The biggest change was defining a common
> (struct tcp_key) that merges tcp_ao_key with tcp_md5sig_key on TCP
> fast-path, therefore in order to help reviewing I provide
> the ranged-diff between the versions here:
>
>    https://gist.github.com/0x7f454c46/fe546b9cf323ca21acc3d0eabbd41236
>
> There's one Sparse warning introduced by tcp_sigpool_start():
> __cond_acquires() seems to currently being broken. I've described
> the reasoning for it on v9 cover letter. Also, checkpatch.pl warnings
> were addressed, but yet I've left the ones that are more personal
> preferences (i.e. 80 columns limit). Please, ping me if you have
> a strong feeling about one of them.
>
> The following changes since commit a5ea26536e89d04485aa9e1c8f60ba11dfc5469e:
>
>   Merge branch 'stmmac-devvm_stmmac_probe_config_dt-conversion' (2023-09-18 12:44:36 +0100)

Sorry for the delay, but I was looking at a bug in TCP MD5.

I will ask you to fix it, before we change everything in the stack
related to MD5 :/

I am releasing a syzbot report right now, I will CC you on it.