From nobody Thu Jul 10 14:42:47 2025 X-Original-To: dev-commits-src-all@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 4bdHd35Y9Sz617hQ; Thu, 10 Jul 2025 14:42:47 +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 4bdHd32wDRz4MpY; Thu, 10 Jul 2025 14:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752158567; 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=RA3kj8EgtLM9yToQ7zSkE80U/i5zBhonZKQs3HD65qA=; b=K2bUQ6k4W24xlcw2asGNlLgntJAuKmR/WejtKzuK347K9ehKH0q/nGE4qpfYOyMuIoME5T 1XfZtqjKsUilFNhzlWCR0+agfI+tig1sP0iz7malQQMYhfNXrogI2HeRbmx/a6Va0QHZwy eqzE7YTDdHfcg88kZh2/OeOlc0m1THWb3FriSOqJnan5U7mPRnaSc7v4HjwwswrGMCRzOl s2+8R7PDX8AMynu27qy/MASPChljdLu99UoupaTToEZUB8yLH0yfaCCvjK23usgUpJF6yG /NrB/6wCFnyO2SCa6bfQg7XoerZcyMO84RJ0cSBvDhPFPMBvMbxbLofnBiKisw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752158567; 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=RA3kj8EgtLM9yToQ7zSkE80U/i5zBhonZKQs3HD65qA=; b=ytOu1chTFo+8WdEaEBWi1pCheon49gO/K+mzJRaJuelrexUCwnIy8FFxwci9y9XH0Pd3Jk Brm6Jn5BBrAl8S9PVS1rfEa/fDm8LKuG5YuutiG8JEFy4GpNKSOi5xWhh2MnkfnhS+BpEk qDDgsIU6hbtAPgBCDIEHdw3V1loviSdwhpm+bX+3g5RHv9gjuWpYNI69gM2HimqCnzMs47 7qRu06wTGBbnUGCR/0SwoIGTmxMxILclMN6sELnEQx9kGF11w8PSTFe3QErW/C9Qg4UEOr mEEyqDRtAdKrx2Z/vweQBZTCS+6fra/AFf2A39r+k/JLVzMO78DESBbUr9FJrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752158567; a=rsa-sha256; cv=none; b=PsrhYKsd9dMVy2YbpeZdYgFK3LP3w7qR5P6Xn450WgTwy2E6i6FrEX7Pw5Bu+AuYIAmKoX EDwp0HAtRGDCytUUeDlE51dPze/cJJOT2+TBysVaoWCY4uNHh3+hzJBEzWq7Vy9v8VL8ot 56boVek3a8Rv36jyr3k+iYnj2Ux5oNYT5GQoyim5yGGMzQlqDx/mIFXMA7mAgr90F1YEDy VjUKtK0xkbW8OfcPuZinminENbfkdqZxhO9usEB26ypl5DZC4jSmzmNde2RVO0bsFLku1X fe3+qDCLpHCmSyvq+mZD/MRLyj4UCPnc917+EXkLPJmulKsXrYN9WtIHbLBzQA== 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 4bdHd32W0hz19lP; Thu, 10 Jul 2025 14:42:47 +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 56AEglbZ015039; Thu, 10 Jul 2025 14:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56AEgljV015036; Thu, 10 Jul 2025 14:42:47 GMT (envelope-from git) Date: Thu, 10 Jul 2025 14:42:47 GMT Message-Id: <202507101442.56AEgljV015036@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: b435452e6b23 - main - sysctl net.inet.tcp.ktlslist: allow snd_tag_status_str() to sleep List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b435452e6b2314e45131b6a3afaa1f4d674a7e17 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b435452e6b2314e45131b6a3afaa1f4d674a7e17 commit b435452e6b2314e45131b6a3afaa1f4d674a7e17 Author: Konstantin Belousov AuthorDate: 2025-07-03 10:37:35 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-10 14:42:27 +0000 sysctl net.inet.tcp.ktlslist: allow snd_tag_status_str() to sleep For this, unlock inp around the calls, taking the reference on it. If the inp appears to be freed or unlinked after the relock, return EDEADLK. Reviewed by: glebius, markj Sponsored by: Nvidia networking Differential revision: https://reviews.freebsd.org/D51143 --- sys/netinet/tcp_subr.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index cd42a67294a6..f8811649fe19 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2720,8 +2720,12 @@ tcp_ktlslist_locked(SYSCTL_HANDLER_ARGS, bool export_keys) ksr->snd_tag->sw->snd_tag_status_str != NULL) { sz = SND_TAG_STATUS_MAXLEN; + in_pcbref(inp); + INP_RUNLOCK(inp); ksr->snd_tag->sw->snd_tag_status_str( ksr->snd_tag, NULL, &sz); + if (in_pcbrele_rlock(inp)) + return (EDEADLK); len += sz; } } @@ -2739,8 +2743,12 @@ tcp_ktlslist_locked(SYSCTL_HANDLER_ARGS, bool export_keys) kss->snd_tag->sw->snd_tag_status_str != NULL) { sz = SND_TAG_STATUS_MAXLEN; + in_pcbref(inp); + INP_RUNLOCK(inp); kss->snd_tag->sw->snd_tag_status_str( kss->snd_tag, NULL, &sz); + if (in_pcbrele_rlock(inp)) + return (EDEADLK); len += sz; } } @@ -2811,8 +2819,12 @@ tcp_ktlslist_locked(SYSCTL_HANDLER_ARGS, bool export_keys) if (ksr->snd_tag != NULL && ksr->snd_tag->sw->snd_tag_status_str != NULL) { sz = SND_TAG_STATUS_MAXLEN; + in_pcbref(inp); + INP_RUNLOCK(inp); ksr->snd_tag->sw->snd_tag_status_str( ksr->snd_tag, buf + len, &sz); + if (in_pcbrele_rlock(inp)) + return (EDEADLK); len += sz; } } @@ -2828,8 +2840,12 @@ tcp_ktlslist_locked(SYSCTL_HANDLER_ARGS, bool export_keys) if (kss->snd_tag != NULL && kss->snd_tag->sw->snd_tag_status_str != NULL) { sz = SND_TAG_STATUS_MAXLEN; + in_pcbref(inp); + INP_RUNLOCK(inp); kss->snd_tag->sw->snd_tag_status_str( kss->snd_tag, buf + len, &sz); + if (in_pcbrele_rlock(inp)) + return (EDEADLK); len += sz; } } @@ -2853,6 +2869,10 @@ tcp_ktlslist_locked(SYSCTL_HANDLER_ARGS, bool export_keys) zfree(buf, M_TEMP); return (error); + +again_reset: + req->oldidx = 0; + goto again; } static int