Date: Fri, 21 Nov 2025 14:25:36 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 7c1579142208 - stable/15 - unix: Remove an always-false null pointer check Message-ID: <69207660.2c863.bdc9e5c@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7c15791422080eea051a9a2ae47f7923a972922d commit 7c15791422080eea051a9a2ae47f7923a972922d Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2025-11-13 22:57:35 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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:help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69207660.2c863.bdc9e5c>