| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CANn89i+LwYbzNd=mA8Hk0RTTy6siEUpGtJaRw7DdFQju_+4mjA@mail.gmail.com>
Date: Wed, 11 Oct 2023 19:53:10 +0200
From: Eric Dumazet <edumazet@...gle.com>
To: Dmitry Safonov <dima@...sta.com>
Cc: David Ahern <dsahern@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
Jakub Kicinski <kuba@...nel.org>,
"David S. Miller" <davem@...emloft.net>,
linux-kernel@...r.kernel.org,
Andy Lutomirski <luto@...capital.net>,
Ard Biesheuvel <ardb@...nel.org>,
Bob Gilligan <gilligan@...sta.com>,
Dan Carpenter <error27@...il.com>,
David Laight <David.Laight@...lab.com>,
Dmitry Safonov <0x7f454c46@...il.com>,
Donald Cassidy <dcassidy@...hat.com>,
Eric Biggers <ebiggers@...nel.org>,
"Eric W. Biederman" <ebiederm@...ssion.com>,
Francesco Ruggeri <fruggeri05@...il.com>,
"Gaillardetz, Dominik" <dgaillar@...na.com>,
Herbert Xu <herbert@...dor.apana.org.au>,
Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>,
Ivan Delalande <colona@...sta.com>,
Leonard Crestez <cdleonard@...il.com>,
"Nassiri, Mohammad" <mnassiri@...na.com>,
Salam Noureddine <noureddine@...sta.com>,
Simon Horman <simon.horman@...igine.com>,
"Tetreault, Francois" <ftetreau@...na.com>, netdev@...r.kernel.org
Subject: Re: [PATCH v14 net-next 16/23] net/tcp: Ignore specific ICMPs for
TCP-AO connections
On Tue, Oct 10, 2023 at 1:07 AM Dmitry Safonov <dima@...sta.com> wrote:
>
> Similarly to IPsec, RFC5925 prescribes:
> ">> A TCP-AO implementation MUST default to ignore incoming ICMPv4
> messages of Type 3 (destination unreachable), Codes 2-4 (protocol
> unreachable, port unreachable, and fragmentation needed -- ’hard
> errors’), and ICMPv6 Type 1 (destination unreachable), Code 1
> (administratively prohibited) and Code 4 (port unreachable) intended
> for connections in synchronized states (ESTABLISHED, FIN-WAIT-1, FIN-
> WAIT-2, CLOSE-WAIT, CLOSING, LAST-ACK, TIME-WAIT) that match MKTs."
>
> A selftest (later in patch series) verifies that this attack is not
> possible in this TCP-AO implementation.
>
> Co-developed-by: Francesco Ruggeri <fruggeri@...sta.com>
> Signed-off-by: Francesco Ruggeri <fruggeri@...sta.com>
> Co-developed-by: Salam Noureddine <noureddine@...sta.com>
> Signed-off-by: Salam Noureddine <noureddine@...sta.com>
> Signed-off-by: Dmitry Safonov <dima@...sta.com>
> Acked-by: David Ahern <dsahern@...nel.org>
> ---
> include/net/tcp_ao.h | 10 ++++++-
> include/uapi/linux/snmp.h | 1 +
> include/uapi/linux/tcp.h | 4 ++-
> net/ipv4/proc.c | 1 +
> net/ipv4/tcp_ao.c | 58 +++++++++++++++++++++++++++++++++++++++
> net/ipv4/tcp_ipv4.c | 7 +++++
> net/ipv6/tcp_ipv6.c | 7 +++++
> 7 files changed, 86 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/tcp_ao.h b/include/net/tcp_ao.h
> index 8c315c3f31da..eec38e9e6380 100644
> --- a/include/net/tcp_ao.h
> +++ b/include/net/tcp_ao.h
> @@ -24,6 +24,7 @@ struct tcp_ao_counters {
> atomic64_t pkt_bad;
> atomic64_t key_not_found;
> atomic64_t ao_required;
> + atomic64_t dropped_icmp;
> };
>
> struct tcp_ao_key {
> @@ -92,7 +93,8 @@ struct tcp_ao_info {
> struct tcp_ao_key *rnext_key;
> struct tcp_ao_counters counters;
> u32 ao_required :1,
> - __unused :31;
> + accept_icmps :1,
> + __unused :30;
> __be32 lisn;
> __be32 risn;
> /* Sequence Number Extension (SNE) are upper 4 bytes for SEQ,
> @@ -191,6 +193,7 @@ int tcp_ao_calc_traffic_key(struct tcp_ao_key *mkt, u8 *key, void *ctx,
> unsigned int len, struct tcp_sigpool *hp);
> void tcp_ao_destroy_sock(struct sock *sk, bool twsk);
> void tcp_ao_time_wait(struct tcp_timewait_sock *tcptw, struct tcp_sock *tp);
> +bool tcp_ao_ignore_icmp(const struct sock *sk, int type, int code);
> enum skb_drop_reason tcp_inbound_ao_hash(struct sock *sk,
> const struct sk_buff *skb, unsigned short int family,
> const struct request_sock *req,
> @@ -274,6 +277,11 @@ static inline void tcp_ao_syncookie(struct sock *sk, const struct sk_buff *skb,
> {
> }
>
> +static inline bool tcp_ao_ignore_icmp(const struct sock *sk, int type, int code)
> +{
> + return false;
> +}
> +
> static inline enum skb_drop_reason tcp_inbound_ao_hash(struct sock *sk,
> const struct sk_buff *skb, unsigned short int family,
> const struct request_sock *req, const struct tcp_ao_hdr *aoh)
> diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
> index 06ddf4cd295c..47a6b47da66f 100644
> --- a/include/uapi/linux/snmp.h
> +++ b/include/uapi/linux/snmp.h
> @@ -300,6 +300,7 @@ enum
> LINUX_MIB_TCPAOBAD, /* TCPAOBad */
> LINUX_MIB_TCPAOKEYNOTFOUND, /* TCPAOKeyNotFound */
> LINUX_MIB_TCPAOGOOD, /* TCPAOGood */
> + LINUX_MIB_TCPAODROPPEDICMPS, /* TCPAODroppedIcmps */
> __LINUX_MIB_MAX
> };
>
> diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
> index 62543f7c5523..e4ddca6178ca 100644
> --- a/include/uapi/linux/tcp.h
> +++ b/include/uapi/linux/tcp.h
> @@ -404,7 +404,8 @@ struct tcp_ao_info_opt { /* setsockopt(TCP_AO_INFO) */
> set_rnext :1, /* corresponding ::rnext */
> ao_required :1, /* don't accept non-AO connects */
> set_counters :1, /* set/clear ::pkt_* counters */
> - reserved :28; /* must be 0 */
> + accept_icmps :1, /* accept incoming ICMPs */
> + reserved :27; /* must be 0 */
> __u16 reserved2; /* padding, must be 0 */
> __u8 current_key; /* KeyID to set as Current_key */
> __u8 rnext; /* KeyID to set as Rnext_key */
> @@ -412,6 +413,7 @@ struct tcp_ao_info_opt { /* setsockopt(TCP_AO_INFO) */
> __u64 pkt_bad; /* failed verification */
> __u64 pkt_key_not_found; /* could not find a key to verify */
> __u64 pkt_ao_required; /* segments missing TCP-AO sign */
> + __u64 pkt_dropped_icmp; /* ICMPs that were ignored */
> } __attribute__((aligned(8)));
>
> /* setsockopt(fd, IPPROTO_TCP, TCP_ZEROCOPY_RECEIVE, ...) */
> diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
> index 3f643cd29cfe..5d3c9c96773e 100644
> --- a/net/ipv4/proc.c
> +++ b/net/ipv4/proc.c
> @@ -302,6 +302,7 @@ static const struct snmp_mib snmp4_net_list[] = {
> SNMP_MIB_ITEM("TCPAOBad", LINUX_MIB_TCPAOBAD),
> SNMP_MIB_ITEM("TCPAOKeyNotFound", LINUX_MIB_TCPAOKEYNOTFOUND),
> SNMP_MIB_ITEM("TCPAOGood", LINUX_MIB_TCPAOGOOD),
> + SNMP_MIB_ITEM("TCPAODroppedIcmps", LINUX_MIB_TCPAODROPPEDICMPS),
> SNMP_MIB_SENTINEL
> };
>
> diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c
> index 801174c17853..168073cd1c89 100644
> --- a/net/ipv4/tcp_ao.c
> +++ b/net/ipv4/tcp_ao.c
> @@ -15,6 +15,7 @@
>
> #include <net/tcp.h>
> #include <net/ipv6.h>
> +#include <net/icmp.h>
>
> int tcp_ao_calc_traffic_key(struct tcp_ao_key *mkt, u8 *key, void *ctx,
> unsigned int len, struct tcp_sigpool *hp)
> @@ -44,6 +45,60 @@ int tcp_ao_calc_traffic_key(struct tcp_ao_key *mkt, u8 *key, void *ctx,
> return 1;
> }
>
> +bool tcp_ao_ignore_icmp(const struct sock *sk, int type, int code)
> +{
> + bool ignore_icmp = false;
> + struct tcp_ao_info *ao;
> +
> + /* RFC5925, 7.8:
> + * >> A TCP-AO implementation MUST default to ignore incoming ICMPv4
> + * messages of Type 3 (destination unreachable), Codes 2-4 (protocol
> + * unreachable, port unreachable, and fragmentation needed -- ’hard
> + * errors’), and ICMPv6 Type 1 (destination unreachable), Code 1
> + * (administratively prohibited) and Code 4 (port unreachable) intended
> + * for connections in synchronized states (ESTABLISHED, FIN-WAIT-1, FIN-
> + * WAIT-2, CLOSE-WAIT, CLOSING, LAST-ACK, TIME-WAIT) that match MKTs.
> + */
> + if (READ_ONCE(sk->sk_family) == AF_INET) {
You can not use sk->sk_family to make this decision.
It could be AF_INET6 and yet the flow could be IPv4. (dual stack)
Let the caller pass this information ?
tcp_ao_ignore_icmp(sk, AF_INET, type, code);
tcp_ao_ignore_icmp(sk, AF_INET6, type, code);
> + if (type != ICMP_DEST_UNREACH)
> + return false;
> + if (code < ICMP_PROT_UNREACH || code > ICMP_FRAG_NEEDED)
> + return false;
> + } else {
> + if (type != ICMPV6_DEST_UNREACH)
> + return false;
> + if (code != ICMPV6_ADM_PROHIBITED && code != ICMPV6_PORT_UNREACH)
> + return false;
> + }
> +
> + rcu_read_lock();
> + switch (sk->sk_state) {
> + case TCP_TIME_WAIT:
> + ao = rcu_dereference(tcp_twsk(sk)->ao_info);
> + break;
> + case TCP_SYN_SENT:
> + case TCP_SYN_RECV:
> + case TCP_LISTEN:
> + case TCP_NEW_SYN_RECV:
> + /* RFC5925 specifies to ignore ICMPs *only* on connections
> + * in synchronized states.
> + */
> + rcu_read_unlock();
> + return false;
> + default:
> + ao = rcu_dereference(tcp_sk(sk)->ao_info);
> + }
> +
> + if (ao && !ao->accept_icmps) {
> + ignore_icmp = true;
> + __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAODROPPEDICMPS);
> + atomic64_inc(&ao->counters.dropped_icmp);
> + }
> + rcu_read_unlock();
> +
> + return ignore_icmp;
> +}
>
Powered by blists - more mailing lists