From nobody Tue Apr 14 23:24:17 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 4fwL2b3h9Tz6ZbDN for ; Tue, 14 Apr 2026 23:24:23 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwL2b0hJYz3Qb9 for ; Tue, 14 Apr 2026 23:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776209063; 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=6kXC19q8AmQcpohB67DwKYG3x/sdQhrv4TTbhB/lrNM=; b=nGRerWttHxGRaeXlnwBG27P1pe5GyS7uy8NbZbr8lEWw0PdF1U46yBJDorFP1DE6ki7YUk woSeAvVj7IjlbZGBiRvC4pGKGob6fIWRgFMReHVB82DC/XK9OW9xQNEtgzuTztF/gkVKU0 E/LCx+ImyuJ54q0i4r6IKHf92rRoGoHopSXnsc5BybaZUtpoob97fvMils+xOnXEAuB2Ft 7nIbSJ8WGo38jUQvNU+XdWotxgwtdkUpulKXaRO08Ic5Hzj0Cxxz0EcksMoPDUPH3x5oxk K1sF88bzxl4I1cjiZ+NDGvTZ1csG5agu12mKtiDKx+F4D2J+fjDGgf1wKv/k/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776209063; a=rsa-sha256; cv=none; b=t6yqhuWDzXELtNd81KXZPYmVMsqzUcqz8YeAuufLLFB8QKP6zKvby27xfXYzrEtWIiqnar 0ddcGKVR7EjSjG77qIzwE9Le8VB5RsZ+iasaZhQVN3W+GDwR9R3shYrNdVi/TK5d6zz83t fKGovMNsPDvA3X9a26m6QlO7Lj63yfEKprATGCNwbXBlV/+3KfVcJw6lQvZHalYczdUcYQ EJik9/ilshSZc5bDbBLxay/CQKMn5/gg9CSMR/rP+ngCf/eHCIGTFNqz3xEkS1qvUClCaF Mi4+yGE8EuqmPHa4pO1XCHQSUwQZ+iFdgjpinul52R/N1MEHPGcyNHkeNWj6Ew== 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=1776209063; 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=6kXC19q8AmQcpohB67DwKYG3x/sdQhrv4TTbhB/lrNM=; b=SV6ZpNQUAMu9D39z0SqrHi07qC3d7WLSrn2O8yCZSLkrcK5xS7eqi+1aaIi4S9bU/xzPHJ IwqyYpNbVJom4X5sfIarZAAp9je5sVLDqlU15YMfN/hctyCDkXzlSQpaE8E/LRos0SU++h I5prcEhKPU6cUhWAe7/VNU58egx99XpmmL9qjNH8aO4v0TokPkCH8YZb6JdD9MGVN9kFLq yeqQtLzFon/4eV+XtkdWnfOy/9FOanbBPMB5u+eV/L5LbQP6AlS63XwlPk+U10bQ753PYm mfQqYQ1KzZYlFAPGOTagdR/niQ93XA42kVzbIhGRYvagR8DwNmHniXehiwkzCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwL2b04pbz19sJ for ; Tue, 14 Apr 2026 23:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31320 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 23:24:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 6b00c652db7f - main - inpcb: make in6_pcbdisconnect() just like in_pcbdisconnect() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b00c652db7f43c698e8e3a902f266025c3126ac Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 23:24:17 +0000 Message-Id: <69decca1.31320.3f0a2e24@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6b00c652db7f43c698e8e3a902f266025c3126ac commit 6b00c652db7f43c698e8e3a902f266025c3126ac Author: Gleb Smirnoff AuthorDate: 2026-04-14 23:23:26 +0000 Commit: Gleb Smirnoff CommitDate: 2026-04-14 23:23:26 +0000 inpcb: make in6_pcbdisconnect() just like in_pcbdisconnect() Allow to be passed with already unconnected inpcb. Fixes: 4fadf2466468dd6dcb6cf9e3739ed696a18c1bb4 --- sys/netinet6/in6_pcb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index ad596cf761d2..3750c7040fbc 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -531,6 +531,9 @@ in6_pcbdisconnect(struct inpcb *inp) KASSERT(inp->inp_smr == SMR_SEQ_INVALID, ("%s: inp %p was already disconnected", __func__, inp)); + if (inp->inp_flags & INP_UNCONNECTED) + return; + INP_HASH_WLOCK(inp->inp_pcbinfo); in_pcbremhash(inp); inp->inp_flags |= INP_UNCONNECTED;