From nobody Fri Nov 14 00:46:16 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 4d6z3F1bB6z6GXhY; Fri, 14 Nov 2025 00:46:17 +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 4d6z3F0wv4z3dpZ; Fri, 14 Nov 2025 00:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763081177; 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=fejBfEz9eKaVwkgI0jHuMnbBNFcuresv6zWPanPc/I8=; b=A8yJ0hG6K79EfgcVP6sDBHzL2JWaS5XktaVnUOqJOfr98M+8SdlsAtZUb057GhP8DTeoo0 J0HcRitXpfbtom38alll9rzdnBE/2DxIwblntGjIhu6pyVg7+S89roBOWs9AmD2jm9WfR3 xwNuxrLiD3yIyM4EqB6ypa0sawIEbJrjZ7bZjO3ohy3Mls0olLTD0xDcVs7SCZS36JG8f4 gj3+9uySnVj3PIcLG1xyRa9+XPbwYLKzkdTSyNXxqErA6sDUiVSJEgkKJduB1l4dNYJ8NL GR+Iv2NR2OWVYteAMRndGIGeQlQO9brIzvuf5cU1yZhbytOoZvOlNOK3JKBfig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763081177; 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=fejBfEz9eKaVwkgI0jHuMnbBNFcuresv6zWPanPc/I8=; b=DSLvILitRfnlypU5oR187WL40zbNjjErEZnKfvOlQUR42L1tPvo4+YX+34Tly2QCeegQRY UsqC1XRmE2LJduVyzxMmxvSImu522DV4UAe2S1Dmzv1gccR90p1WSSowS/YD3UckiE6Ro5 r22t6CjglGxZUfYvgr5tvifM2z59NQmRXpoAveG0brwA3hD9wVuyWONi+6w2ZIgpjTJdNA uuTSi3QQtrQK1/qipg5GcMIXHHPe+tsaSQmgDEBMlWfLRuaYDskzstVt5ghNS8fmjFkQMJ PgSqHk/AIPopPFjSxLq/R5+sBCH3WzSvw9XVZ80K6o8IOQYxqour6/yvcpENbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763081177; a=rsa-sha256; cv=none; b=vGulRNjPVrig9eHT0UNw5r5oMAa+SndXWUtqupCG6M4sju3hiGcgVOe76j6QeNSeOjd89F QKyD9qfrgaBsvEhHUsuGjOG6ux6ZCUR61lVVG5wdf0AyuQm9+t5OEDr7fuCaY3JtduDQOt FEH30NPYRrArEfNzENN+BZt3UiOszKSNpLq5/Sb/ah2AtKoa4WXgtg8kFGh6+7w4ZMHRMq woCtv60Taj7e/IK7AtTt05ySgeZ3i6s/3F8vuRWhFS6pu0HIr3E10U6f+XyE2/rXGYe+Pi YAKqKrCFWIVKjkGp5qDbcqeaULg1Y0Y7wN17t+idHbVuNX1NV+lN4olLpx03Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d6z3F0J4lzlJL; Fri, 14 Nov 2025 00:46:17 +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 5AE0kGnp092946; Fri, 14 Nov 2025 00:46:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AE0kGf3092943; Fri, 14 Nov 2025 00:46:16 GMT (envelope-from git) Date: Fri, 14 Nov 2025 00:46:16 GMT Message-Id: <202511140046.5AE0kGf3092943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ce5692bf009e - main - unix: Remove an always-false null pointer check 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce5692bf009ed5607d3b880eec4055697479c13d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ce5692bf009ed5607d3b880eec4055697479c13d commit ce5692bf009ed5607d3b880eec4055697479c13d Author: Mark Johnston AuthorDate: 2025-11-13 22:57:35 +0000 Commit: Mark Johnston CommitDate: 2025-11-14 00:43:38 +0000 unix: Remove an always-false null pointer check No functional change intended. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53453 --- 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 8c9fa4c012e4..86e1694fb869 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -3216,11 +3216,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: