From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B6BE1FF7C8 for ; Mon, 1 Sep 2025 05:36:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756705018; cv=none; b=XNL3liOG8VXZuSf7sLgIyE7jcILnTUUBIG04cnvAHMnAnYandxIa9VplPJP3Wp+bci6aJ+HwViWRm018s852mPbP4Q2vzledF853rbyYLuDcmYITT13MPZuH6aG3j684+jOIgdUtRrjlffjV6Le7UDcfjVBql8PZjt86HW73EN4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756705018; c=relaxed/simple; bh=llhJJljrqXE/nWKIJH6bsdO9U75zcLrBsfAa7Q+iaFo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=GlZh3wIqIIhAPYMSm8/hEPivFxLU3GhxWeELeFpgZJwnzFDy6HdzXf53BOuYys5m/dBnB2kd4O01QzweIOOVIJwN4T9DNf3HrFmdmZhY/Ju4IdrQfHVpR6RcBd6h4IKNQkmfe/yQrQnw2a70Rf5aN+/qLkiUujBN1wAKe3pDvk0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UwxN7Ihg; arc=none smtp.client-ip=209.85.215.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UwxN7Ihg" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-b4717543ed9so2555166a12.3 for ; Sun, 31 Aug 2025 22:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756705016; x=1757309816; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4KAcVYU3uNaOGJX0D+bRdMikx+btd5MUoQ4qyYq/2YM=; b=UwxN7Ihgk9a6uh245/UP0HzvpuBOz2HA8dMt4AOhtvDuF+63gMHYe/edOk1rAPWSj/ xgQjIMgJ4wOrFSqBHX5J7gSAttPy0ZqH6LkV23BBFJjyNTrnjFiLvmJGEZ6kgTZKF4rB wJ2sbxeAQB/3hDtcYzWpLAZJ1UZJuvwPluobrrCbV4wLF15p/bBvt3xLvF/Y0G2nFi+7 sbIHWAFUpnrHY90z8UmeCa/2jRlio8SWFDqHgmimU2GZ6Rh8w/h0+VQguJRhfZfl+Nxk u0K0jlmmed3lQNk60PbpowXqdtRvLV27rcUUw5IYt5HxgKtf5GsjvQp3bZbIvJ0OHXaX 3wgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756705016; x=1757309816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4KAcVYU3uNaOGJX0D+bRdMikx+btd5MUoQ4qyYq/2YM=; b=GtjXhtYDZPfp2HOhxqvyBTnZ6k0JrWwAUQqEk4WmBX1TRwURriZG8+negWFgfNd90D 2uXdsVtH5diWVeEP8KWlCqhMMc1VZ4QF9TwZe+hCJ+T7N5M5SZvkeO7XVEnHQXcd+tQo HmZK7SCNdfpgxQvOduc7vbU6a53YslFISsJH5NZEONOQmvTXgUvfxzSVTHCVzH9wdHoY PLRppHZhSCZIGMpRbGJKjWaf+mezHHbzD62tfwsa42ADxcpeGVHSoePM+pBjJfyK6ODt WSIHO+GH/+Wpml7TP7LTG81ImQQEWKxmKZY9srnuhceqVKxZi8hTP5tQ3d/J+NWc13gh K75g== X-Forwarded-Encrypted: i=1; AJvYcCWd3W3XUmqDkRHh2P9EWFKlTmJMpXHpqAPd/cDIskJjlQl9Yi5eV1M49ANesTCw81Wb5n/zUUkziKiEDkLA9B813+sdlA==@lists.linux.dev X-Gm-Message-State: AOJu0YzNH/hLQrbWpYUbaYdSIpylnslpvwWlTQJyQSCThx2KlYuQGGnr 7kiqaMZrfRQ3I9jRB9SGrvZ6kRpBxOeGgw/VoOB7AJTE7CG7PWfaqfjZ X-Gm-Gg: ASbGncvPDDYm+HmIR72HWigWR/XtFAMTl7ZgK3rMKFAgLQzI1suatHIsATdjRrDKULC 9kK2VzvsvKT8gu2bcwErmYylw7H9jUc0TWY+BxN16PfQ3BEuU/nJ9KuqXya/jt5fBeQaYRDda+S KUJqXh1B0enOHnMkkPFIbRJ+XXywpJGfQEUy6M1asV1Z5sTJd/sYX9JQEAxizX/OiGPgcIbS6OK 6r3h3g4N8or1AJ3PGXqCkkmOw7GigRYN66Rc8IiG8Dp7EpdtGocvkeOJbKZDaSrFBlQvL2V9CU3 rr4YvhNvWtZfX924S6ZjHOk1a/WOdUO0Xr8/4On63TbPg9Q3q4ZyQ2MoruVeoP/1ZpYeDXL75yh b3ulEFuUHw6TtkuxxlDTMHa384g== X-Google-Smtp-Source: AGHT+IGSocsv1UrbOfElqChC8G4ok7ZHIlxd4vHe9Yfc5PSkMlMar8u2FM+ORvRGYMuaN4FFKpyUSQ== X-Received: by 2002:a17:902:e842:b0:242:9be2:102b with SMTP id d9443c01a7336-249446d2e9dmr82660375ad.0.1756705016354; Sun, 31 Aug 2025 22:36:56 -0700 (PDT) Received: from fedora ([159.196.5.243]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-249037027casm93399325ad.5.2025.08.31.22.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Aug 2025 22:36:55 -0700 (PDT) From: Wilfred Mallawa To: chuck.lever@oracle.com, kernel-tls-handshake@lists.linux.dev Cc: "David S . Miller" , donald.hunter@gmail.com, edumazet@google.com, hare@kernel.org, horms@kernel.org, jakub.kicinski@kernel.org, john.fastabend@gmail.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, wilfred.mallawa@wdc.com, Hannes Reinecke Subject: [PATCH] net/tls: allow limiting maximum record size Date: Mon, 1 Sep 2025 15:36:19 +1000 Message-ID: <20250901053618.103198-2-wilfred.opensource@gmail.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: kernel-tls-handshake@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Wilfred Mallawa During a handshake, an endpoint may specify a maximum record size limit. Currently, the kernel defaults to TLS_MAX_PAYLOAD_SIZE (16KB) for the maximum record size. Meaning that, the outgoing records from the kernel can exceed a lower size negotiated during the handshake. In such a case, the TLS endpoint must send a fatal "record_overflow" alert [1], and thus the record is discarded. Upcoming Western Digital NVMe-TCP hardware controllers implement TLS support. For these devices, supporting TLS record size negotiation is necessary because the maximum TLS record size supported by the controller is less than the default 16KB currently used by the kernel. This patch adds support for retrieving the negotiated record size limit during a handshake, and enforcing it at the TLS layer such that outgoing records are no larger than the size negotiated. This patch depends on the respective userspace support in tlshd [2] and GnuTLS [3]. [1] https://www.rfc-editor.org/rfc/rfc8449 [2] https://github.com/oracle/ktls-utils/pull/112 [3] https://gitlab.com/gnutls/gnutls/-/merge_requests/2005 Signed-off-by: Wilfred Mallawa Reviewed-by: Hannes Reinecke --- Documentation/netlink/specs/handshake.yaml | 3 +++ include/net/tls.h | 2 ++ include/uapi/linux/handshake.h | 1 + net/handshake/genl.c | 5 ++-- net/handshake/tlshd.c | 29 +++++++++++++++++++++- net/tls/tls_sw.c | 6 ++++- 6 files changed, 42 insertions(+), 4 deletions(-) diff --git a/Documentation/netlink/specs/handshake.yaml b/Documentation/netlink/specs/handshake.yaml index 95c3fade7a8d..0dbe5d0c8507 100644 --- a/Documentation/netlink/specs/handshake.yaml +++ b/Documentation/netlink/specs/handshake.yaml @@ -87,6 +87,9 @@ attribute-sets: name: remote-auth type: u32 multi-attr: true + - + name: record-size-limit + type: u32 operations: list: diff --git a/include/net/tls.h b/include/net/tls.h index 857340338b69..02e7b59fcc30 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -250,6 +250,8 @@ struct tls_context { */ unsigned long flags; + u32 tls_record_size_limit; + /* cache cold stuff */ struct proto *sk_proto; struct sock *sk; diff --git a/include/uapi/linux/handshake.h b/include/uapi/linux/handshake.h index 662e7de46c54..645eeb76622f 100644 --- a/include/uapi/linux/handshake.h +++ b/include/uapi/linux/handshake.h @@ -55,6 +55,7 @@ enum { HANDSHAKE_A_DONE_STATUS = 1, HANDSHAKE_A_DONE_SOCKFD, HANDSHAKE_A_DONE_REMOTE_AUTH, + HANDSHAKE_A_DONE_RECORD_SIZE_LIMIT, __HANDSHAKE_A_DONE_MAX, HANDSHAKE_A_DONE_MAX = (__HANDSHAKE_A_DONE_MAX - 1) diff --git a/net/handshake/genl.c b/net/handshake/genl.c index f55d14d7b726..fb8962ae7131 100644 --- a/net/handshake/genl.c +++ b/net/handshake/genl.c @@ -16,10 +16,11 @@ static const struct nla_policy handshake_accept_nl_policy[HANDSHAKE_A_ACCEPT_HAN }; /* HANDSHAKE_CMD_DONE - do */ -static const struct nla_policy handshake_done_nl_policy[HANDSHAKE_A_DONE_REMOTE_AUTH + 1] = { +static const struct nla_policy handshake_done_nl_policy[__HANDSHAKE_A_DONE_MAX] = { [HANDSHAKE_A_DONE_STATUS] = { .type = NLA_U32, }, [HANDSHAKE_A_DONE_SOCKFD] = { .type = NLA_S32, }, [HANDSHAKE_A_DONE_REMOTE_AUTH] = { .type = NLA_U32, }, + [HANDSHAKE_A_DONE_RECORD_SIZE_LIMIT] = { .type = NLA_U32, }, }; /* Ops table for handshake */ @@ -35,7 +36,7 @@ static const struct genl_split_ops handshake_nl_ops[] = { .cmd = HANDSHAKE_CMD_DONE, .doit = handshake_nl_done_doit, .policy = handshake_done_nl_policy, - .maxattr = HANDSHAKE_A_DONE_REMOTE_AUTH, + .maxattr = HANDSHAKE_A_DONE_MAX, .flags = GENL_CMD_CAP_DO, }, }; diff --git a/net/handshake/tlshd.c b/net/handshake/tlshd.c index 081093dfd553..8847cbf20d45 100644 --- a/net/handshake/tlshd.c +++ b/net/handshake/tlshd.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -37,6 +38,8 @@ struct tls_handshake_req { key_serial_t th_certificate; key_serial_t th_privkey; + struct socket *th_sock; + unsigned int th_num_peerids; key_serial_t th_peerid[5]; }; @@ -52,6 +55,7 @@ tls_handshake_req_init(struct handshake_req *req, treq->th_consumer_data = args->ta_data; treq->th_peername = args->ta_peername; treq->th_keyring = args->ta_keyring; + treq->th_sock = args->ta_sock; treq->th_num_peerids = 0; treq->th_certificate = TLS_NO_CERT; treq->th_privkey = TLS_NO_PRIVKEY; @@ -85,6 +89,27 @@ static void tls_handshake_remote_peerids(struct tls_handshake_req *treq, } } +static void tls_handshake_record_size(struct tls_handshake_req *treq, + struct genl_info *info) +{ + struct tls_context *tls_ctx; + struct nlattr *head = nlmsg_attrdata(info->nlhdr, GENL_HDRLEN); + struct nlattr *nla; + u32 record_size_limit; + int rem, len = nlmsg_attrlen(info->nlhdr, GENL_HDRLEN); + + nla_for_each_attr(nla, head, len, rem) { + if (nla_type(nla) == HANDSHAKE_A_DONE_RECORD_SIZE_LIMIT) { + record_size_limit = nla_get_u32(nla); + if (treq->th_sock) { + tls_ctx = tls_get_ctx(treq->th_sock->sk); + tls_ctx->tls_record_size_limit = record_size_limit; + } + break; + } + } +} + /** * tls_handshake_done - callback to handle a CMD_DONE request * @req: socket on which the handshake was performed @@ -98,8 +123,10 @@ static void tls_handshake_done(struct handshake_req *req, struct tls_handshake_req *treq = handshake_req_private(req); treq->th_peerid[0] = TLS_NO_PEERID; - if (info) + if (info) { tls_handshake_remote_peerids(treq, info); + tls_handshake_record_size(treq, info); + } if (!status) set_bit(HANDSHAKE_F_REQ_SESSION, &req->hr_flags); diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index bac65d0d4e3e..85b1243b4210 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1037,6 +1037,7 @@ static int tls_sw_sendmsg_locked(struct sock *sk, struct msghdr *msg, ssize_t copied = 0; struct sk_msg *msg_pl, *msg_en; struct tls_rec *rec; + u32 tls_record_size_limit; int required_size; int num_async = 0; bool full_record; @@ -1058,6 +1059,9 @@ static int tls_sw_sendmsg_locked(struct sock *sk, struct msghdr *msg, } } + tls_record_size_limit = min_not_zero(tls_ctx->tls_record_size_limit, + TLS_MAX_PAYLOAD_SIZE); + while (msg_data_left(msg)) { if (sk->sk_err) { ret = -sk->sk_err; @@ -1079,7 +1083,7 @@ static int tls_sw_sendmsg_locked(struct sock *sk, struct msghdr *msg, orig_size = msg_pl->sg.size; full_record = false; try_to_copy = msg_data_left(msg); - record_room = TLS_MAX_PAYLOAD_SIZE - msg_pl->sg.size; + record_room = tls_record_size_limit - msg_pl->sg.size; if (try_to_copy >= record_room) { try_to_copy = record_room; full_record = true; -- 2.51.0