From nobody Wed Jun 21 18:41:04 2023 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 4QmXQ86chXz4gN1y; Wed, 21 Jun 2023 18:41:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmXQ864Sqz3LbW; Wed, 21 Jun 2023 18:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687372864; 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=UKjO5Q62kNK4fIivYV7fa8XJAZ/2EuBpCx8YBM/b2Os=; b=wNp7IYK3rzgn2Ja+8Bi51mQIl9tenNdrPojt/SdwfSYxwkI4XJloJ/3hFz/3ntvKowpjsz VybMTdHZQ+dtXnX8lsBk3A5HFcrpCHVkbEXvQK4sIzuFSUePPmpjuYGTUw7DcLE+zDhsLf wwLzZWctAMR4ctWuo2WsSwuE8VCuVR6hG7A9TI7JNuCNhe+sXSWpEVPTb3YZXP15R9Bs46 ykhVbRIAXTxV/tphlKX6lBXLmiFb1F3S1fKEQqZ/hB1f9g7RaEbhJrMnqJxS1dGFtWeMqE 3efMxD1SDPbWE6gOXOizT/lzpiCPDnEOysrN+3WseDXtbHUK89pPfMJVgLWk9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687372864; 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=UKjO5Q62kNK4fIivYV7fa8XJAZ/2EuBpCx8YBM/b2Os=; b=EchDM6oP0shO4w7QaJgbfsmNf2d54LxPD44zfqlkg2BkcFrYfYn2PoeNo+WP1YAjpp+X5J 8wMjwFHWjhi8bcyAvYjVZBxx37Qb4rzjLjbKklDTbQabR0xSZT6EuHJcyZ48nCVm5PyAZM Pj37u7Rdr9YRdn5YT0+U3nbY2tvUE0fOPk/OAd89TAn1PYmKWydCmfefFMJJl6nxSszzht vWWRCZKgjelwfkyikXFKsGfLwonDspYsRWMQ2y1SQ3gn3di2O1icjYMGN+JduplUEj5Lvp pD4zBDQSF1rvjZw4D0fOZ9fynbImtIw2k5/JwmAXo4GhYqLvxUO2UbX1vJTCAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687372864; a=rsa-sha256; cv=none; b=JPkpG02TEZa8VyZ0IHK7V/s/5UIyxGHKwuIXsmKtZjXRQAhgmH+G4eanGgZ2kmZCnhwDX1 HEAql/W14jxa09WWPb0nk4CKXe2BZSXPN2hwovaqLdS2THPI2lcwrARn9bT26W2kIydk5f LpIl49XHbeC9W7D6Z054XcqeudBoKMGdLzKJVYtFNzwnZkiBAKt7G4SHjtwqrsbOtk0uhG iEFR+s6kplgVdPzLCEHox3DK7eco1ZUr3LlPe5PpbJTaT5LEpEsTXpbE1Sn/lDNDpnWPp8 OXZsuZh/XC1kih6N5Yji+Zr8WJTvLWV03G8j8766PgNJVIVnPe+fJq63l+X9AA== 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 4QmXQ85BhNzs5H; Wed, 21 Jun 2023 18:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LIf4DI048349; Wed, 21 Jun 2023 18:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LIf4i1048348; Wed, 21 Jun 2023 18:41:04 GMT (envelope-from git) Date: Wed, 21 Jun 2023 18:41:04 GMT Message-Id: <202306211841.35LIf4i1048348@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: 712079d38106 - main - unix: Fix uipc_peeraddr() to handle self-connected 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 712079d3810617ba7a28e959f5536b1ee06e30e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=712079d3810617ba7a28e959f5536b1ee06e30e1 commit 712079d3810617ba7a28e959f5536b1ee06e30e1 Author: Mark Johnston AuthorDate: 2023-06-21 18:20:16 +0000 Commit: Mark Johnston CommitDate: 2023-06-21 18:38:26 +0000 unix: Fix uipc_peeraddr() to handle self-connected sockets Reported by: syzbot+c2da2dbae5fe006556bc@syzkaller.appspotmail.com Reported by: syzbot+b4d6b093b1d78bfa859b@syzkaller.appspotmail.com Fixes: e8f6e5b2d969 ("unix: Fix locking in uipc_peeraddr()") MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/kern/uipc_usrreq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index bd7a2cca245f..100891cfef68 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -890,16 +890,16 @@ uipc_peeraddr(struct socket *so, struct sockaddr **nam) unp2 = unp_pcb_lock_peer(unp); if (unp2 != NULL) { if (unp2->unp_addr != NULL) - sa = (struct sockaddr *) unp2->unp_addr; + sa = (struct sockaddr *)unp2->unp_addr; else sa = &sun_noname; bcopy(sa, *nam, sa->sa_len); - UNP_PCB_UNLOCK(unp2); + unp_pcb_unlock_pair(unp, unp2); } else { sa = &sun_noname; bcopy(sa, *nam, sa->sa_len); + UNP_PCB_UNLOCK(unp); } - UNP_PCB_UNLOCK(unp); return (0); }