From nobody Thu Jul 10 14:42:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bdHd63Nvvz617q5; Thu, 10 Jul 2025 14:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdHd53w4lz4MbG; Thu, 10 Jul 2025 14:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752158569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rsb/NSuxVEcER7+N4lAPR0xcJ5mEobZxVQeAqJt5yGg=; b=giurE8tsEXE3/e/J7shOHoImL53EaPZlmrPVEgCsYVM4b49U5rJj9KIkiJCesahQXGTyvb EmEKnIZdKsMHdqk570UBi3LVtOzAxKPyUuBVIfL4Gtb0kHKvSywJKDTJT4LxsTNlewFPUj jskJM3lFd/R0VePLF/Z7231Ex5QJ8Wfj67rXKpKoqt594wvN/1N0icEdBAIcydeXpwuClg 39gqspeREksCI5fdbhirY2sYuqXBJbsZD7B9UwwjnsGky3SqiTKpTL1LGIE6SQkXas9pZb JENBpYjLJVo3jWHgauhz81RjsWWDO9K6kHSoWgQBwmPzKmLpodeHHUQGFLYhVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752158569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rsb/NSuxVEcER7+N4lAPR0xcJ5mEobZxVQeAqJt5yGg=; b=rvbLnm7UmObrKG+VmbWgJiymipyRoJySHi2t77ndQTVNfvT3OJf3e/KGsTSc+ycqo2b7NL JNyYrJTBAaeG6fYtXlvGDEMDuwYJ40kVfEM6uQ0QLz3npjr9pNwMGuJZC5+vhzr07dCJ7c Go4DEuHrfRCNiufxAycHm0g0uEpYOMLHM3kqH2W+9pgWk1BRWL+e88oVB5QkGQ9B1h4yLb Aebkw8APTzNE/yfOBSMriPwfjdnHljG5s9kCa8VNo3sxIMBSt1FXQVvCG4pDJ+VgjEQeF+ yUS4K279gfPmBeoFp8pfeihb7Q+JQHI8Tycpq40qil7+d9qJ/qLnLxbMVS2UAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752158569; a=rsa-sha256; cv=none; b=ssMLd8QOd6TJnGfvRZyFEQDBOfizFyZngqBXWmcH0+hNWcYJMa977QGFCXbGwhKCbuT+gt tbd5fj6VvSOrz+m3t9f7gXW6VzBWhPeLwoE5fyzKQ5e61sIjQ4WgAt7vVE35TMeDBYcMgU PDE2BAG2DDcoTPZwJSuxAwWutNqXbllQj0IS/6Woa25VzlYuoIbx6R5A/nkWCdvmFw1HPd 9zBdsJUOLQIUMjYyhXl8s+Fl/MU6LR/xrm93EZHA+YigCYVkxZauSPUaVgR0czDTRrZ2xN k3/uhVRYSGZpQAqWY8Zlvx8GOyX+ilWjyOJGKoBXYb1vckQaBsJzmEERC5qKyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bdHd53Vqgz19xK; Thu, 10 Jul 2025 14:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56AEgnEn015112; Thu, 10 Jul 2025 14:42:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56AEgnRL015109; Thu, 10 Jul 2025 14:42:49 GMT (envelope-from git) Date: Thu, 10 Jul 2025 14:42:49 GMT Message-Id: <202507101442.56AEgnRL015109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d7c807aa884d - main - sysctl net.inet.tcp.ktcplist: properly fill driver status length field List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7c807aa884d178e9bd17afe7adaccb22b3b0dc3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d7c807aa884d178e9bd17afe7adaccb22b3b0dc3 commit d7c807aa884d178e9bd17afe7adaccb22b3b0dc3 Author: Konstantin Belousov AuthorDate: 2025-07-09 01:41:16 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-10 14:42:27 +0000 sysctl net.inet.tcp.ktcplist: properly fill driver status length field Also ignore errors from drivers. If driver snd_tag status method returned an error, silently ignore the returned string, and not advance the position of the filled buffer. Sponsored by: Nvidia networking --- sys/netinet/tcp_subr.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 45048fb3848d..db415f6bdf03 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2722,11 +2722,13 @@ tcp_ktlslist_locked(SYSCTL_HANDLER_ARGS, bool export_keys) sz = SND_TAG_STATUS_MAXLEN; in_pcbref(inp); INP_RUNLOCK(inp); - ksr->snd_tag->sw->snd_tag_status_str( + error = ksr->snd_tag->sw-> + snd_tag_status_str( ksr->snd_tag, NULL, &sz); if (in_pcbrele_rlock(inp)) return (EDEADLK); - len += sz; + if (error == 0) + len += sz; } } kss = so->so_snd.sb_tls_info; @@ -2745,11 +2747,13 @@ tcp_ktlslist_locked(SYSCTL_HANDLER_ARGS, bool export_keys) sz = SND_TAG_STATUS_MAXLEN; in_pcbref(inp); INP_RUNLOCK(inp); - kss->snd_tag->sw->snd_tag_status_str( + error = kss->snd_tag->sw-> + snd_tag_status_str( kss->snd_tag, NULL, &sz); if (in_pcbrele_rlock(inp)) return (EDEADLK); - len += sz; + if (error == 0) + len += sz; } } if (p) { @@ -2821,11 +2825,14 @@ tcp_ktlslist_locked(SYSCTL_HANDLER_ARGS, bool export_keys) sz = SND_TAG_STATUS_MAXLEN; in_pcbref(inp); INP_RUNLOCK(inp); - ksr->snd_tag->sw->snd_tag_status_str( + error = ksr->snd_tag->sw->snd_tag_status_str( ksr->snd_tag, buf + len, &sz); if (in_pcbrele_rlock(inp)) return (EDEADLK); - len += sz; + if (error == 0) { + xktls->rcv.drv_st_len = sz; + len += sz; + } } } if (kss != NULL && kss->gen == xig.xig_gen) { @@ -2842,11 +2849,14 @@ tcp_ktlslist_locked(SYSCTL_HANDLER_ARGS, bool export_keys) sz = SND_TAG_STATUS_MAXLEN; in_pcbref(inp); INP_RUNLOCK(inp); - kss->snd_tag->sw->snd_tag_status_str( + error = kss->snd_tag->sw->snd_tag_status_str( kss->snd_tag, buf + len, &sz); if (in_pcbrele_rlock(inp)) return (EDEADLK); - len += sz; + if (error == 0) { + xktls->snd.drv_st_len = sz; + len += sz; + } } } len = roundup2(len, __alignof(*xktls));