| 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: <20241113-tcp-md5-diag-prep-v2-4-00a2a7feb1fa@gmail.com>
Date: Wed, 13 Nov 2024 18:46:43 +0000
From: Dmitry Safonov via B4 Relay <devnull+0x7f454c46.gmail.com@...nel.org>
To: "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, Simon Horman <horms@...nel.org>,
David Ahern <dsahern@...nel.org>, Ivan Delalande <colona@...sta.com>,
Matthieu Baerts <matttbe@...nel.org>, Mat Martineau <martineau@...nel.org>,
Geliang Tang <geliang@...nel.org>, Boris Pismenny <borisp@...dia.com>,
John Fastabend <john.fastabend@...il.com>,
Davide Caratti <dcaratti@...hat.com>, Kuniyuki Iwashima <kuniyu@...zon.com>
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
mptcp@...ts.linux.dev, Dmitry Safonov <0x7f454c46@...il.com>
Subject: [PATCH net v2 4/5] net/diag: Always pre-allocate tcp_ulp info
From: Dmitry Safonov <0x7f454c46@...il.com>
Currently there is a theoretical race between netlink one-socket dump
and allocating icsk->icsk_ulp_ops.
Simplify the expectations by always allocating maximum tcp_ulp-info.
With the previous patch the typical netlink message allocation was
decreased for kernel replies on requests without idiag_ext flags,
so let's use it.
Fixes: 61723b393292 ("tcp: ulp: add functions to dump ulp-specific information")
Signed-off-by: Dmitry Safonov <0x7f454c46@...il.com>
---
include/net/tcp.h | 1 -
net/ipv4/inet_diag.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
net/ipv4/tcp_diag.c | 13 -------------
net/mptcp/diag.c | 20 --------------------
net/tls/tls_main.c | 17 -----------------
5 files changed, 50 insertions(+), 51 deletions(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index d1948d357dade0842777265d3397842919f9eee0..757711aa5337ae7e6abee62d303eb66d37082e19 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -2568,7 +2568,6 @@ struct tcp_ulp_ops {
void (*release)(struct sock *sk);
/* diagnostic */
int (*get_info)(struct sock *sk, struct sk_buff *skb);
- size_t (*get_info_size)(const struct sock *sk);
/* clone ulp */
void (*clone)(const struct request_sock *req, struct sock *newsk,
const gfp_t priority);
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 2dd173a73bd1e2657957e5e4ecb70401cc85dfda..ac6d9ee8e2cc21fc97d6018547d33b540712e780 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -97,6 +97,55 @@ void inet_diag_msg_common_fill(struct inet_diag_msg *r, struct sock *sk)
}
EXPORT_SYMBOL_GPL(inet_diag_msg_common_fill);
+static size_t tls_get_info_size(void)
+{
+ size_t size = 0;
+
+#ifdef CONFIG_TLS
+ size += nla_total_size(0) + /* INET_ULP_INFO_TLS */
+ nla_total_size(sizeof(u16)) + /* TLS_INFO_VERSION */
+ nla_total_size(sizeof(u16)) + /* TLS_INFO_CIPHER */
+ nla_total_size(sizeof(u16)) + /* TLS_INFO_RXCONF */
+ nla_total_size(sizeof(u16)) + /* TLS_INFO_TXCONF */
+ nla_total_size(0) + /* TLS_INFO_ZC_RO_TX */
+ nla_total_size(0) + /* TLS_INFO_RX_NO_PAD */
+ 0;
+#endif
+
+ return size;
+}
+
+static size_t subflow_get_info_size(void)
+{
+ size_t size = 0;
+
+#ifdef CONFIG_MPTCP
+ size += nla_total_size(0) + /* INET_ULP_INFO_MPTCP */
+ nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_TOKEN_REM */
+ nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_TOKEN_LOC */
+ nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_RELWRITE_SEQ */
+ nla_total_size_64bit(8) + /* MPTCP_SUBFLOW_ATTR_MAP_SEQ */
+ nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_MAP_SFSEQ */
+ nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_SSN_OFFSET */
+ nla_total_size(2) + /* MPTCP_SUBFLOW_ATTR_MAP_DATALEN */
+ nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_FLAGS */
+ nla_total_size(1) + /* MPTCP_SUBFLOW_ATTR_ID_REM */
+ nla_total_size(1) + /* MPTCP_SUBFLOW_ATTR_ID_LOC */
+ 0;
+#endif
+
+ return size;
+}
+
+static size_t tcp_ulp_ops_size(void)
+{
+ size_t size = max(tls_get_info_size(), subflow_get_info_size());
+
+ return size +
+ nla_total_size(0) + /* INET_DIAG_ULP_INFO */
+ nla_total_size(TCP_ULP_NAME_MAX); /* INET_ULP_INFO_NAME */
+}
+
static size_t inet_sk_attr_size(struct sock *sk,
const struct inet_diag_req_v2 *req,
bool net_admin)
@@ -115,6 +164,7 @@ static size_t inet_sk_attr_size(struct sock *sk,
ret += nla_total_size(sizeof(struct tcp_info))
+ nla_total_size(sizeof(struct inet_diag_msg))
+ inet_diag_msg_attrs_size()
+ + tcp_ulp_ops_size()
+ 64;
if (ext & (1 << (INET_DIAG_MEMINFO - 1)))
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index d752dc5de3536303aeb075c10fbdc2c9fc417cd5..a60968ceb1553b2d219290b84a36b05a2d1fa8d2 100644
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -154,7 +154,6 @@ static int tcp_diag_get_aux(struct sock *sk, bool net_admin,
static size_t tcp_diag_get_aux_size(struct sock *sk, bool net_admin)
{
- struct inet_connection_sock *icsk = inet_csk(sk);
size_t size = 0;
#ifdef CONFIG_TCP_MD5SIG
@@ -174,18 +173,6 @@ static size_t tcp_diag_get_aux_size(struct sock *sk, bool net_admin)
sizeof(struct tcp_diag_md5sig));
}
#endif
-
- if (net_admin && sk_fullsock(sk)) {
- const struct tcp_ulp_ops *ulp_ops;
-
- ulp_ops = icsk->icsk_ulp_ops;
- if (ulp_ops) {
- size += nla_total_size(0) +
- nla_total_size(TCP_ULP_NAME_MAX);
- if (ulp_ops->get_info_size)
- size += ulp_ops->get_info_size(sk);
- }
- }
return size;
}
diff --git a/net/mptcp/diag.c b/net/mptcp/diag.c
index 2d3efb405437d85c0bca70d7a92ca3a7363365e1..8b36867e4ddd5f45cebcf60e9093a061d5208756 100644
--- a/net/mptcp/diag.c
+++ b/net/mptcp/diag.c
@@ -84,27 +84,7 @@ static int subflow_get_info(struct sock *sk, struct sk_buff *skb)
return err;
}
-static size_t subflow_get_info_size(const struct sock *sk)
-{
- size_t size = 0;
-
- size += nla_total_size(0) + /* INET_ULP_INFO_MPTCP */
- nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_TOKEN_REM */
- nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_TOKEN_LOC */
- nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_RELWRITE_SEQ */
- nla_total_size_64bit(8) + /* MPTCP_SUBFLOW_ATTR_MAP_SEQ */
- nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_MAP_SFSEQ */
- nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_SSN_OFFSET */
- nla_total_size(2) + /* MPTCP_SUBFLOW_ATTR_MAP_DATALEN */
- nla_total_size(4) + /* MPTCP_SUBFLOW_ATTR_FLAGS */
- nla_total_size(1) + /* MPTCP_SUBFLOW_ATTR_ID_REM */
- nla_total_size(1) + /* MPTCP_SUBFLOW_ATTR_ID_LOC */
- 0;
- return size;
-}
-
void mptcp_diag_subflow_init(struct tcp_ulp_ops *ops)
{
ops->get_info = subflow_get_info;
- ops->get_info_size = subflow_get_info_size;
}
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 6b4b9f2749a6fd6de495940c5cb3f2154a5a451e..f3491c4e942e08dc882cb81eef071203384b2b37 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -1072,22 +1072,6 @@ static int tls_get_info(struct sock *sk, struct sk_buff *skb)
return err;
}
-static size_t tls_get_info_size(const struct sock *sk)
-{
- size_t size = 0;
-
- size += nla_total_size(0) + /* INET_ULP_INFO_TLS */
- nla_total_size(sizeof(u16)) + /* TLS_INFO_VERSION */
- nla_total_size(sizeof(u16)) + /* TLS_INFO_CIPHER */
- nla_total_size(sizeof(u16)) + /* TLS_INFO_RXCONF */
- nla_total_size(sizeof(u16)) + /* TLS_INFO_TXCONF */
- nla_total_size(0) + /* TLS_INFO_ZC_RO_TX */
- nla_total_size(0) + /* TLS_INFO_RX_NO_PAD */
- 0;
-
- return size;
-}
-
static int __net_init tls_init_net(struct net *net)
{
int err;
@@ -1123,7 +1107,6 @@ static struct tcp_ulp_ops tcp_tls_ulp_ops __read_mostly = {
.init = tls_init,
.update = tls_update,
.get_info = tls_get_info,
- .get_info_size = tls_get_info_size,
};
static int __init tls_register(void)
--
2.42.2
Powered by blists - more mailing lists