From nobody Mon Jan 20 00:27:58 2025 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 4Ybrlf3wYwz5lw9V; Mon, 20 Jan 2025 00:27:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ybrlf3GRzz3djM; Mon, 20 Jan 2025 00:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737332878; 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=RoyQEvpCyRxopGiTiXBfaho2IpAhqFWiWZEcCKgD2YY=; b=YdvW+tEAxvpnBpYT/Y2Ou2xpldCchun34R9pfSk3xLTPBPNWnD+L1iTEd/xzC761QZTtn/ CTNkYa86fWIkJ4TNX9nU7HV1mED4IngC+3QhCsG340fKwUYCMJ8JEOs82TESEoDaw4NKvN zZFr+cxZikV5QSJPvWcS1wkAjUWX1MTAIaqLTqqxEKlufYfmEHjkqXWT8SWuKiTj2IHL6n 66ziEQAV/urnBJwfOhhbFpJIXJcxAK52fEorGkGAX0YMUX6CE6BKc4UNKOu7QJgXuSvnaO 8wu4GR59Dd+WT/3A6DdC0+6jyQfOYHnhETZpCO7Ii04Na3a2u4H3SJ2EWsak3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737332878; 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=RoyQEvpCyRxopGiTiXBfaho2IpAhqFWiWZEcCKgD2YY=; b=JnbhOAiW8NjwTM+D5McXqLk7jgOMAT+IoBG5CiAwqWShgdryVVSdwVhzEWvGjBVUzMhXJB lmFuQCpaOxS5sdn3wrp5lT2/CRqm6wHPwoWytk5mvAVbYxRBd9MYPG4q/Sb00+HI7f5Vb9 9KXwzI2jPW6VNvg62C+UByYXNC81MJAAdQl2d2xpRCBxMn8KJx4oz81TaYu5lqOpHHxh1F UJxObjTdFuPbqNtQtY+uY9wOGr7CRkpzkXigJOe1wD2g3dttx51+f3LC4TH9arf1aJ2OTO 66NAtpBf/RbDOifboOdur/cw26J5pPXosAA7fTV9FbaW2jyODHDM2V6nQzKzIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737332878; a=rsa-sha256; cv=none; b=MrW/FgoHmjmnIydq7QYS/0rLHpv+4LvKns33cIElCtXF+zf8BEa1dCyRhp4L7Rv4aRUniA RCHrHFshagHAJHuQjJviD4UWbW0T3BHXRFMySa/bxr9gmomndpW/N/PGGCZSWBvqL5CTO1 LyVXsOsn3zCG+2QNitfDcUY9wihZ20m7sRdek4JKBO7nPBTlCV0wdbov+DcV4jRcojD/5G 61RfbWfirYTKiqaJ9SolCldgZCphErpjFN44RcXfJwRgRdH5e81F0tASNFvtI9sHM4K4Tx ypD9QMN6QIokckerx6hWapYPpbfdRbjarzY+jYEfPl6ubpiF6Ln3Dbn3UZa5uQ== 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 4Ybrlf2qMTz1Bpy; Mon, 20 Jan 2025 00:27:58 +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 50K0Rwot019006; Mon, 20 Jan 2025 00:27:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50K0RwdY019003; Mon, 20 Jan 2025 00:27:58 GMT (envelope-from git) Date: Mon, 20 Jan 2025 00:27:58 GMT Message-Id: <202501200027.50K0RwdY019003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8373644ee2c8 - stable/14 - unix: Be consistent about error handling for unconnected sockets 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8373644ee2c848bab47d87d24b31d673e6515bce Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8373644ee2c848bab47d87d24b31d673e6515bce commit 8373644ee2c848bab47d87d24b31d673e6515bce Author: Mark Johnston AuthorDate: 2025-01-06 22:55:38 +0000 Commit: Mark Johnston CommitDate: 2025-01-20 00:26:27 +0000 unix: Be consistent about error handling for unconnected sockets SOCK_STREAM and SOCK_SEQPACKET sockets should get the same treatment here. PR: 176420 MFC after: 2 weeks (cherry picked from commit 1c933f464fdbb630f9663751f04c29cdcda38902) --- sys/kern/uipc_usrreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 78469adcd84d..80ac5cc0b775 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1779,7 +1779,7 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) if (unp->unp_flags & UNP_HAVEPC) xu = unp->unp_peercred; else { - if (so->so_type == SOCK_STREAM) + if (so->so_proto->pr_flags & PR_CONNREQUIRED) error = ENOTCONN; else error = EINVAL;