From nobody Thu Dec 18 07:32:45 2025 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 1876EC04FE2 for ; Tue, 15 Aug 2023 19:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239982AbjHOTQN (ORCPT ); Tue, 15 Aug 2023 15:16:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239913AbjHOTPd (ORCPT ); Tue, 15 Aug 2023 15:15:33 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B615E7A for ; Tue, 15 Aug 2023 12:15:31 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-31781e15a0cso5061398f8f.3 for ; Tue, 15 Aug 2023 12:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; t=1692126930; x=1692731730; 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=lsQiK0TqLbOG2bW6KuQFoGfMxi8zrL+jjjVnjiMjbb8=; b=MSeJFeXLZHFK1M7oVOR4BeUqOV8SrDzoti06AjnZjynIqsGFqgiVw88T6S0Q84GTml cH9TTsS+IeRcvN1DkIwIJobIgMu7J/03xkfnMcnal30MqwMA3gggr69cfJ6f7iKp5iIq MWm7rEaXW33eJDzeNP1hUTcjoT0hw6mnRF58b4MMK2liMU3B+MeVz5K1owUYPo0nONXZ uG95Wd0humqvEc88xz8djE79yUhWpN9vajiC8T5+LQZI2YcdujHte3fWQ2p7/RztnmLe YdfVC9UpJYHEvU730Y6vnX4bVAtzvTGmugrXM+2kZC+4/PHtJjdTXqn/6MserjCsait3 G9Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692126930; x=1692731730; 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=lsQiK0TqLbOG2bW6KuQFoGfMxi8zrL+jjjVnjiMjbb8=; b=A2Qh9sr3UW2czgfzV+vyonFPbwcRm6tMu1V4nQYu/epDv1i7NJMH3ID96s4QOOVTeT 304blOIaGymi3hLqscVRalUjob0XIAy6GFkleOz9ik1HTlHjNwBWawNaeWCW0ryON+eg 1EnP66Y5V6sAWnNtA2Rto3lj4VdRzWg2GXzTi7eZhbcI3WE0hCFlOWCRp6g8rJeZjeGk wmEtBt30SKIzPHmQxLJiRK1xqHGVw8wPyDcZkyxq1W8IJqSTY+/EYM/jPgqVKiJgcC5F 0Qq3QeJAAKSD2MBu0f0iEVE8922TLwP8afFpw7LFd2jLc3zQtxTNUNwEa86Z9ObmvXa+ cGqQ== X-Gm-Message-State: AOJu0YyidbKrAl0qsLX8YqUR6jJ9/Y5YpP8vNhBl0Dcp16K3FGnyBCAQ N1BPMxi1LEXcFFEX0OjRFpzsEQ== X-Google-Smtp-Source: AGHT+IFlZ69hHHCZc8xFF+QoKEMeycB2BpyvGgB10lwx1JREgO1dfAe+bwOgA7jsyqfOP87LNnEp9g== X-Received: by 2002:a5d:6b90:0:b0:317:60a8:f3a7 with SMTP id n16-20020a5d6b90000000b0031760a8f3a7mr8046497wrx.10.1692126930003; Tue, 15 Aug 2023 12:15:30 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003fbbe41fd78sm18779737wmc.10.2023.08.15.12.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Aug 2023 12:15:29 -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 , "Nassiri, Mohammad" , Salam Noureddine , Simon Horman , "Tetreault, Francois" , netdev@vger.kernel.org Subject: [PATCH v10 net-next 15/23] net/tcp: Add tcp_hash_fail() ratelimited logs Date: Tue, 15 Aug 2023 20:14:44 +0100 Message-ID: <20230815191455.1872316-16-dima@arista.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230815191455.1872316-1-dima@arista.com> References: <20230815191455.1872316-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a helper for logging connection-detailed messages for failed TCP hash verification (both MD5 and AO). 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/net/tcp.h | 14 ++++++++++++-- include/net/tcp_ao.h | 29 +++++++++++++++++++++++++++++ net/ipv4/tcp.c | 23 +++++++++++++---------- net/ipv4/tcp_ao.c | 7 +++++++ 4 files changed, 61 insertions(+), 12 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index a71e6a6f5192..85e0f0b50261 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -2642,12 +2642,18 @@ tcp_inbound_hash(struct sock *sk, const struct requ= est_sock *req, int l3index; =20 /* Invalid option or two times meet any of auth options */ - if (tcp_parse_auth_options(th, &md5_location, &aoh)) + if (tcp_parse_auth_options(th, &md5_location, &aoh)) { + tcp_hash_fail("TCP segment has incorrect auth options set", + family, skb, ""); return SKB_DROP_REASON_TCP_AUTH_HDR; + } =20 if (req) { if (tcp_rsk_used_ao(req) !=3D !!aoh) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOBAD); + tcp_hash_fail("TCP connection can't start/end using TCP-AO", + family, skb, "%s", + !aoh ? "missing AO" : "AO signed"); return SKB_DROP_REASON_TCP_AOFAILURE; } } @@ -2664,10 +2670,14 @@ tcp_inbound_hash(struct sock *sk, const struct requ= est_sock *req, * the last key is impossible to remove, so there's * always at least one current_key. */ - if (tcp_ao_required(sk, saddr, family, true)) + if (tcp_ao_required(sk, saddr, family, true)) { + tcp_hash_fail("AO hash is required, but not found", + family, skb, "L3 index %d", l3index); return SKB_DROP_REASON_TCP_AONOTFOUND; + } if (unlikely(tcp_md5_do_lookup(sk, l3index, saddr, family))) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5NOTFOUND); + tcp_hash_fail("MD5 Hash not found", family, skb, ""); return SKB_DROP_REASON_TCP_MD5NOTFOUND; } return SKB_NOT_DROPPED_YET; diff --git a/include/net/tcp_ao.h b/include/net/tcp_ao.h index d295ea1b6cb7..986e8dcbb150 100644 --- a/include/net/tcp_ao.h +++ b/include/net/tcp_ao.h @@ -118,6 +118,35 @@ struct tcp_ao_info { struct rcu_head rcu; }; =20 +#define tcp_hash_fail(msg, family, skb, fmt, ...) \ +do { \ + const struct tcphdr *th =3D tcp_hdr(skb); \ + char hdr_flags[5] =3D {}; \ + char *f =3D hdr_flags; \ + \ + if (th->fin) \ + *f++ =3D 'F'; \ + if (th->syn) \ + *f++ =3D 'S'; \ + if (th->rst) \ + *f++ =3D 'R'; \ + if (th->ack) \ + *f++ =3D 'A'; \ + if (f !=3D hdr_flags) \ + *f =3D ' '; \ + if ((family) =3D=3D AF_INET) { \ + net_info_ratelimited("%s for (%pI4, %d)->(%pI4, %d) %s" fmt "\n", \ + msg, &ip_hdr(skb)->saddr, ntohs(th->source), \ + &ip_hdr(skb)->daddr, ntohs(th->dest), \ + hdr_flags, ##__VA_ARGS__); \ + } else { \ + net_info_ratelimited("%s for [%pI6c]:%u->[%pI6c]:%u %s" fmt "\n", \ + msg, &ipv6_hdr(skb)->saddr, ntohs(th->source), \ + &ipv6_hdr(skb)->daddr, ntohs(th->dest), \ + hdr_flags, ##__VA_ARGS__); \ + } \ +} while (0) + #ifdef CONFIG_TCP_AO /* TCP-AO structures and functions */ =20 diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 4a83857fa4ea..0b742c693a1f 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -4368,7 +4368,6 @@ tcp_inbound_md5_hash(const struct sock *sk, const str= uct sk_buff *skb, * o MD5 hash and we're not expecting one. * o MD5 hash and its wrong. */ - const struct tcphdr *th =3D tcp_hdr(skb); const struct tcp_sock *tp =3D tcp_sk(sk); struct tcp_md5sig_key *key; u8 newhash[16]; @@ -4378,6 +4377,7 @@ tcp_inbound_md5_hash(const struct sock *sk, const str= uct sk_buff *skb, =20 if (!key && hash_location) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5UNEXPECTED); + tcp_hash_fail("Unexpected MD5 Hash found", family, skb, ""); return SKB_DROP_REASON_TCP_MD5UNEXPECTED; } =20 @@ -4393,16 +4393,19 @@ tcp_inbound_md5_hash(const struct sock *sk, const s= truct sk_buff *skb, if (genhash || memcmp(hash_location, newhash, 16) !=3D 0) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMD5FAILURE); if (family =3D=3D AF_INET) { - net_info_ratelimited("MD5 Hash failed for (%pI4, %d)->(%pI4, %d)%s L3 i= ndex %d\n", - saddr, ntohs(th->source), - daddr, ntohs(th->dest), - genhash ? " tcp_v4_calc_md5_hash failed" - : "", l3index); + tcp_hash_fail("MD5 Hash failed", AF_INET, skb, "%s L3 index %d", + genhash ? "tcp_v4_calc_md5_hash failed" + : "", l3index); } else { - net_info_ratelimited("MD5 Hash %s for [%pI6c]:%u->[%pI6c]:%u L3 index %= d\n", - genhash ? "failed" : "mismatch", - saddr, ntohs(th->source), - daddr, ntohs(th->dest), l3index); + if (genhash) { + tcp_hash_fail("MD5 Hash failed", + AF_INET6, skb, "L3 index %d", + l3index); + } else { + tcp_hash_fail("MD5 Hash mismatch", + AF_INET6, skb, "L3 index %d", + l3index); + } } return SKB_DROP_REASON_TCP_MD5FAILURE; } diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c index 21a711bf6921..226dcefb426a 100644 --- a/net/ipv4/tcp_ao.c +++ b/net/ipv4/tcp_ao.c @@ -765,6 +765,8 @@ tcp_ao_verify_hash(const struct sock *sk, const struct = sk_buff *skb, NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOBAD); atomic64_inc(&info->counters.pkt_bad); atomic64_inc(&key->pkt_bad); + tcp_hash_fail("AO hash wrong length", family, skb, + "%u !=3D %d", maclen, tcp_ao_maclen(key)); return SKB_DROP_REASON_TCP_AOFAILURE; } =20 @@ -779,6 +781,7 @@ tcp_ao_verify_hash(const struct sock *sk, const struct = sk_buff *skb, NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOBAD); atomic64_inc(&info->counters.pkt_bad); atomic64_inc(&key->pkt_bad); + tcp_hash_fail("AO hash mismatch", family, skb, ""); kfree(hash_buf); return SKB_DROP_REASON_TCP_AOFAILURE; } @@ -806,6 +809,8 @@ tcp_inbound_ao_hash(struct sock *sk, const struct sk_bu= ff *skb, info =3D rcu_dereference(tcp_sk(sk)->ao_info); if (!info) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOKEYNOTFOUND); + tcp_hash_fail("AO key not found", family, skb, + "keyid: %u", aoh->keyid); return SKB_DROP_REASON_TCP_AOUNEXPECTED; } =20 @@ -908,6 +913,8 @@ tcp_inbound_ao_hash(struct sock *sk, const struct sk_bu= ff *skb, key_not_found: NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAOKEYNOTFOUND); atomic64_inc(&info->counters.key_not_found); + tcp_hash_fail("Requested by the peer AO key id not found", + family, skb, ""); return SKB_DROP_REASON_TCP_AOKEYNOTFOUND; } =20 --=20 2.41.0