From owner-svn-src-projects@freebsd.org Sun May 10 00:17:39 2020 Return-Path: Delivered-To: svn-src-projects@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 A7C162D2EC1 for ; Sun, 10 May 2020 00:17:39 +0000 (UTC) (envelope-from rmacklem@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 49KPll3yx1z4Tq5; Sun, 10 May 2020 00:17:39 +0000 (UTC) (envelope-from rmacklem@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 8351D24427; Sun, 10 May 2020 00:17:39 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04A0HdY5058864; Sun, 10 May 2020 00:17:39 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04A0Hd7I058863; Sun, 10 May 2020 00:17:39 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202005100017.04A0Hd7I058863@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 10 May 2020 00:17:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r360859 - projects/nfs-over-tls/sys/rpc X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/rpc X-SVN-Commit-Revision: 360859 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.32 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 May 2020 00:17:39 -0000 Author: rmacklem Date: Sun May 10 00:17:39 2020 New Revision: 360859 URL: https://svnweb.freebsd.org/changeset/base/360859 Log: Add some very basic handling of TLS_GET_RECORD control mbufs. For now, it just throws away any that are non-application data. In the future, this will need to change, but not until TLS1.3, I think? Modified: projects/nfs-over-tls/sys/rpc/svc_vc.c Modified: projects/nfs-over-tls/sys/rpc/svc_vc.c ============================================================================== --- projects/nfs-over-tls/sys/rpc/svc_vc.c Sat May 9 23:56:13 2020 (r360858) +++ projects/nfs-over-tls/sys/rpc/svc_vc.c Sun May 10 00:17:39 2020 (r360859) @@ -698,11 +698,13 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_msg *msg, { struct cf_conn *cd = (struct cf_conn *) xprt->xp_p1; struct uio uio; - struct mbuf *m; + struct mbuf *m, *ctrl; struct socket* so = xprt->xp_socket; XDR xdrs; int error, rcvflag; uint32_t xid_plus_direction[3], junk; + struct cmsghdr *cmsg; + struct tls_get_record tgr; /* * Serialise access to the socket and our own record parsing @@ -782,6 +784,7 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_msg *msg, * If receiving is disabled so that a TLS handshake can be * done by the rpctlssd daemon, return FALSE here. */ +tryagain: if (xprt->xp_dontrcv) { sx_xunlock(&xprt->xp_lock); return (FALSE); @@ -797,9 +800,9 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_msg *msg, */ uio.uio_resid = 1000000000; uio.uio_td = curthread; - m = NULL; + ctrl = m = NULL; rcvflag = MSG_DONTWAIT; - error = soreceive(so, NULL, &uio, &m, NULL, &rcvflag); + error = soreceive(so, NULL, &uio, &m, &ctrl, &rcvflag); if (error == EWOULDBLOCK) { /* @@ -838,6 +841,29 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_msg *msg, cd->strm_stat = XPRT_DIED; sx_xunlock(&xprt->xp_lock); return (FALSE); + } + + /* Process any record header(s). */ + if (ctrl != NULL) { +if (ctrl->m_next != NULL) printf("EEK! svc list of controls\n"); + cmsg = mtod(ctrl, struct cmsghdr *); + if (cmsg->cmsg_type == TLS_GET_RECORD && + cmsg->cmsg_len == CMSG_LEN(sizeof(tgr))) { + memcpy(&tgr, CMSG_DATA(cmsg), sizeof(tgr)); + /* + * For now, just toss non-application + * data records. + * In the future, there may need to be + * an upcall done to the daemon. + */ + if (tgr.tls_type != TLS_RLTYPE_APP) { +printf("Got weird type=%d\n", tgr.tls_type); + m_freem(m); + m_free(ctrl); + goto tryagain; + } + } + m_free(ctrl); } if (cd->mpending)