From nobody Fri Nov 21 14:25:36 2025 X-Original-To: dev-commits-src-branches@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 4dCcvN3nG3z6HH1P for ; Fri, 21 Nov 2025 14:25:36 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCcvN1yJqz3fZJ for ; Fri, 21 Nov 2025 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735136; 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=6kBMtHBtxGtC8vBo4bcA8vSMhpMcFlZwEHsE5w/WsUQ=; b=BBSlnddKgcgTfRluBJlyIXavOberWgdKRvChjEiA8MZeB8ykQ2ahFQ8twmukrDnDkcUBFY gM03xIO+rVnI+2EzkeLclLs487ODn36nRqtUDDn4X+RJTdR3E+uNlTDbMCjbWMX07rodW8 yXaf6BDfUC3m4pN7pmJaA19Sacm/h7gjgz/w3hTpSXp+BtimhdtmcaUSOhMLxuojFCSH50 4X5+hgFJrdLN9cU6mR+JeBXnxshHla8atxbfVZhSv1LUUyjURggBfYTSuRVKsYAbv+E+UX QVtP/36NEmj1Xf4v/elLcUKl/bnsBg9UdI+vXoCDMisRZHFEcKmy366LjYarww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735136; 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=6kBMtHBtxGtC8vBo4bcA8vSMhpMcFlZwEHsE5w/WsUQ=; b=c74CdsKqvpquyjl8iuz3PHpHYVDv/NkpGyMAiAosjg5DOVfXgalyOerPSb+SiSQk62KYoc PusaO42mly49I0jbt5/mHDNHAC2yOL6GMTPqm+9kjbLlUNeyS16HDwpTl/7sArX0WLwZD0 epFnRJdHqqthgkYv1vc6jP1dnFtct1DlBBVLO7ujUOdlDOoELij05NFV4BW7TczdcAcHm6 pGDxfLcsXxevqDyfESOuVa8UFk2BoBlJj08rQRAUYEHT0p3HWLzVTwtZ/pVXxSgdPHKJ2a u5TS0mJBtGs7RixlEG4+8aTmUiPUNJTc8qSp1Jyc6UGULwAO7i7u0Ntd3u/mkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763735136; a=rsa-sha256; cv=none; b=M6WBGL/OSGerQ9mkH6MDbO3/AIllPEvnHWqf9W8tF0QiH4egtigu/Lh9v30xXiWKgA9bWn 85DkA1kIClq5JVvBewzZLOJ5PDZLmvfSHy8dHxMg+Pl7sfSuu2T3yZxRK3iZP6dLp0xbGI I2sQoW3q5K2797qNAX/ChEnb5mlHOsiqORfZ/tkMne/Zkt4YHakilZbi1Qxc/gXZhzRKRq K0F29p6rjXSAQZxlezluRTmkwhCZqIyDdOA4pyM7mvUOnRJi9Dm8Rgxl3KQp7XyagFjbTh IytQ6E5e16VjRYUKQ9vdQEAOpKvd42uJAwjaV5ANQ93oYZc7x4VM3sEGicW+tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvN1YwMzxY for ; Fri, 21 Nov 2025 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c863 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 14:25:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7c1579142208 - stable/15 - unix: Remove an always-false null pointer check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 7c15791422080eea051a9a2ae47f7923a972922d Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 14:25:36 +0000 Message-Id: <69207660.2c863.bdc9e5c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7c15791422080eea051a9a2ae47f7923a972922d commit 7c15791422080eea051a9a2ae47f7923a972922d Author: Mark Johnston AuthorDate: 2025-11-13 22:57:35 +0000 Commit: Mark Johnston CommitDate: 2025-11-21 14:15:53 +0000 unix: Remove an always-false null pointer check No functional change intended. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53453 (cherry picked from commit ce5692bf009ed5607d3b880eec4055697479c13d) --- sys/kern/uipc_usrreq.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 21c0b388a9ac..1d0e1c4f8db6 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -3212,11 +3212,9 @@ unp_disconnect(struct unpcb *unp, struct unpcb *unp2) #endif LIST_REMOVE(unp, unp_reflink); UNP_REF_LIST_UNLOCK(); - if (so) { - SOCK_LOCK(so); - so->so_state &= ~SS_ISCONNECTED; - SOCK_UNLOCK(so); - } + SOCK_LOCK(so); + so->so_state &= ~SS_ISCONNECTED; + SOCK_UNLOCK(so); break; case SOCK_STREAM: