From owner-svn-src-head@freebsd.org Mon Apr 13 19:22:05 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE3912C6D56; Mon, 13 Apr 2020 19:22:05 +0000 (UTC) (envelope-from markj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 491JQj583Hz44ll; Mon, 13 Apr 2020 19:22:05 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABBFA207B5; Mon, 13 Apr 2020 19:22:05 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03DJM52C003793; Mon, 13 Apr 2020 19:22:05 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03DJM56L003792; Mon, 13 Apr 2020 19:22:05 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202004131922.03DJM56L003792@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 13 Apr 2020 19:22:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359893 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 359893 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2020 19:22:05 -0000 Author: markj Date: Mon Apr 13 19:22:05 2020 New Revision: 359893 URL: https://svnweb.freebsd.org/changeset/base/359893 Log: Fix sendto() on unconnected SOCK_STREAM/SEQPACKET unix sockets. Previously the unpcb pointer of the newly connected remote socket was not initialized correctly, so attempting to lock it would result in a null pointer dereference. Reported by: syzkaller MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/uipc_usrreq.c Modified: head/sys/kern/uipc_usrreq.c ============================================================================== --- head/sys/kern/uipc_usrreq.c Mon Apr 13 19:20:39 2020 (r359892) +++ head/sys/kern/uipc_usrreq.c Mon Apr 13 19:22:05 2020 (r359893) @@ -1138,25 +1138,29 @@ uipc_send(struct socket *so, int flags, struct mbuf *m case SOCK_STREAM: if ((so->so_state & SS_ISCONNECTED) == 0) { if (nam != NULL) { - if ((error = connect_internal(so, nam, td))) + error = connect_internal(so, nam, td); + if (error != 0) break; - } else { + } else { error = ENOTCONN; break; } - } else if ((unp2 = unp->unp_conn) == NULL) { + } else { + UNP_PCB_LOCK(unp); + } + + if ((unp2 = unp->unp_conn) == NULL) { + UNP_PCB_UNLOCK(unp); error = ENOTCONN; break; } else if (so->so_snd.sb_state & SBS_CANTSENDMORE) { + UNP_PCB_UNLOCK(unp); error = EPIPE; break; - } else { - UNP_PCB_LOCK(unp); - if ((unp2 = unp->unp_conn) == NULL) { - UNP_PCB_UNLOCK(unp); - error = ENOTCONN; - break; - } + } else if ((unp2 = unp->unp_conn) == NULL) { + UNP_PCB_UNLOCK(unp); + error = ENOTCONN; + break; } unp_pcb_owned_lock2(unp, unp2, freed); UNP_PCB_UNLOCK(unp); @@ -1198,15 +1202,11 @@ uipc_send(struct socket *so, int flags, struct mbuf *m sbappend_locked(&so2->so_rcv, m, flags); break; - case SOCK_SEQPACKET: { - const struct sockaddr *from; - - from = &sun_noname; + case SOCK_SEQPACKET: if (sbappendaddr_nospacecheck_locked(&so2->so_rcv, - from, m, control)) + &sun_noname, m, control)) control = NULL; break; - } } mbcnt = so2->so_rcv.sb_mbcnt;