From nobody Tue Apr 21 16:13:44 2026 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 4g0S8S740Pz6YRj5 for ; Tue, 21 Apr 2026 16:13:44 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g0S8S5nH5z3hlY for ; Tue, 21 Apr 2026 16:13:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776788024; 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=jEQ29VvIcPRyCKV7hiMuMSVi14Fd0NGjQ10puoBT5+8=; b=sxSaHo4YiLsaWGzu/Q2CjEEM8kHu1RE2+dqGqQH8LA0FZpgWX6v5pj4jcf6npLiHBlku3n E1OI1XP5umBQoyKJdt2pduZW/GWQjdlIVKJxcUw1yOR+f4viXdOmAmWur6KM9LTW2sgh1N hBn3iR4g64mZeBCaApSjT4dvyAn8EphCAC8+4Ga0/T7IsMfVnonB7pvDd+fW6NwJeYiOWE fO8KPWsRqehDc7T4iIL9Aqw0Vngdumt8tkadavKMEDSUbb7XuHPqn4nv3Q2kJSFU4Pf9ia keNVDuqIXyHQR/NH4p+ThKJreDKMIIfafTkskjLKeDA0TPKYgIYNRq/5aDJYZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776788024; a=rsa-sha256; cv=none; b=NwUtKG9wObZD5o7EZTHiJt3di5YMPMWw9ApXtc/+ba0rOIUaLVwAHrnQX1T/Utc4fUEHHO I7ZpbEJYExqokxXGPcybW1HhdHb6+kYmSWxGWQBpSWk+VkdxQ4lN8fYYQP0XSCs9qwdnD5 /3L7WSd1e8dIkMIorOGe4TMM/U+y0TZoFCVnQcu4kQjiouJKgMCVXAf1hxHCmeuMKHnUsY 87y2XXubFttx5mZGMTXWAiNae3BNONhOpe6aVN/yr1ddbuKPCqpFhJ/9pjlDD677+qdfEK 9+gqNvd0IRGQnegoW7zPAydP+tFsGLP4YaNYkb+F7ej1+kClZKP0lf181r2RtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776788024; 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=jEQ29VvIcPRyCKV7hiMuMSVi14Fd0NGjQ10puoBT5+8=; b=UncFRBYTgbycQMCddGSIOwpTC7Kg01wOqsYpfgkExWpcWNp6mn9Q14LI/PagJa7uIfV9W9 T4OSGwXQSl5NHRiELo6jafnIVgzCullHBONWqFdWmtDcBCOQ5QcRCKt0YJMUsOJvkXeFhS 1tjQz26K2/p7g1TSJ5IxvzBnOKennz4Ay30kREjvFudDHqRcBk5KUXMfOHI1JC1s6S7sva FktA9qv7y+ib4MPWkXiR/N4hF4zbIt2QiZNcKggBGTAfo1XQ0Fr1lLZSmcE6FpBluMRuNL F+jOUvComCwHXQGYkBBm5HdfAMXVyuWSVnYWyrl8lSDN2KWAckAdWQvCk15gbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g0S8S5KCVzrs9 for ; Tue, 21 Apr 2026 16:13:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39e04 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Apr 2026 16:13:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 69e8d8b49d4b - main - tests/sys/netinet/tcp_hpts: Make a socket available in mock inpcbs 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69e8d8b49d4bd889a42ba354f290f05d88bcd4b1 Auto-Submitted: auto-generated Date: Tue, 21 Apr 2026 16:13:44 +0000 Message-Id: <69e7a238.39e04.4dc2f3d2@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=69e8d8b49d4bd889a42ba354f290f05d88bcd4b1 commit 69e8d8b49d4bd889a42ba354f290f05d88bcd4b1 Author: Mark Johnston AuthorDate: 2026-04-21 14:31:18 +0000 Commit: Mark Johnston CommitDate: 2026-04-21 16:13:19 +0000 tests/sys/netinet/tcp_hpts: Make a socket available in mock inpcbs After commit 9b76228006d8, tcp_hptsi() dereferences inp_socket in order to get the inpcb's VNET. This means that mock inpcbs created by the HPTS test fixture must set inp_socket. Also set the current VNET there; previously, it was NULL, and this was not noticed since VNET_DEBUG is disabled even in debug kernels. Fixes: 9b76228006d8 ("inpcb: retire inp_vnet") --- sys/netinet/tcp_hpts_test.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/netinet/tcp_hpts_test.c b/sys/netinet/tcp_hpts_test.c index ea088f5c71cf..a664e9fafcc3 100644 --- a/sys/netinet/tcp_hpts_test.c +++ b/sys/netinet/tcp_hpts_test.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -369,9 +370,15 @@ static struct tcpcb * test_hpts_create_tcpcb(struct ktest_test_context *ctx, struct tcp_hptsi *pace) { struct tcpcb *tp; + struct socket *so; tp = malloc(sizeof(struct tcpcb), M_TCPHPTS, M_WAITOK | M_ZERO); if (tp) { + so = malloc(sizeof(struct socket), M_TCPHPTS, + M_WAITOK | M_ZERO); + so->so_vnet = curvnet; + tp->t_inpcb.inp_socket = so; + rw_init_flags(&tp->t_inpcb.inp_lock, "test-inp", RW_RECURSE | RW_DUPOK); refcount_init(&tp->t_inpcb.inp_refcount, 1); @@ -399,6 +406,7 @@ test_hpts_free_tcpcb(struct tcpcb *tp) return; INP_LOCK_DESTROY(&tp->t_inpcb); + free(tp->t_inpcb.inp_socket, M_TCPHPTS); free(tp, M_TCPHPTS); }