From owner-svn-src-projects@freebsd.org Sun Jul 12 04:26:20 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 D8FD7354942 for ; Sun, 12 Jul 2020 04:26:20 +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) 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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B4DHc5FYRz42Wd; Sun, 12 Jul 2020 04:26:20 +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 7F1591EB21; Sun, 12 Jul 2020 04:26:20 +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 06C4QK19025979; Sun, 12 Jul 2020 04:26:20 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06C4QJf8025977; Sun, 12 Jul 2020 04:26:19 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202007120426.06C4QJf8025977@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 12 Jul 2020 04:26:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363118 - in projects/nfs-over-tls/sys/rpc: . rpcsec_tls X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfs-over-tls/sys/rpc: . rpcsec_tls X-SVN-Commit-Revision: 363118 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.33 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, 12 Jul 2020 04:26:20 -0000 Author: rmacklem Date: Sun Jul 12 04:26:19 2020 New Revision: 363118 URL: https://svnweb.freebsd.org/changeset/base/363118 Log: Hold a reference on the socket, so that it does not get free'd when the daemon closes it. This patch also adds a check for the sb_upcall being non-NULL. Modified: projects/nfs-over-tls/sys/rpc/clnt_vc.c projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctls_impl.c projects/nfs-over-tls/sys/rpc/svc_vc.c Modified: projects/nfs-over-tls/sys/rpc/clnt_vc.c ============================================================================== --- projects/nfs-over-tls/sys/rpc/clnt_vc.c Sun Jul 12 01:11:48 2020 (r363117) +++ projects/nfs-over-tls/sys/rpc/clnt_vc.c Sun Jul 12 04:26:19 2020 (r363118) @@ -912,6 +912,11 @@ clnt_vc_destroy(CLIENT *cl) ct->ct_sslusec, ct->ct_sslrefno, &reterr); } + /* Must sorele() to get rid of reference. */ + CURVNET_SET(so->so_vnet); + SOCK_LOCK(so); + sorele(so); + CURVNET_RESTORE(); } else { soshutdown(so, SHUT_WR); soclose(so); Modified: projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctls_impl.c ============================================================================== --- projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctls_impl.c Sun Jul 12 01:11:48 2020 (r363117) +++ projects/nfs-over-tls/sys/rpc/rpcsec_tls/rpctls_impl.c Sun Jul 12 04:26:19 2020 (r363118) @@ -288,6 +288,7 @@ printf("falloc=%d fd=%d\n", error, fd); * not close the socket and will leave that for * the daemon to do. */ + soref(so); ssl[0] = ssl[1] = 0; ssl[2] = RPCTLS_REFNO_HANDSHAKE; CLNT_CONTROL(concl, CLSET_TLS, ssl); @@ -317,6 +318,7 @@ printf("falloc=%d fd=%d\n", error, fd); * with the socket, it cannot be closed by * the server side krpc code (svc_vc.c). */ + soref(so); sx_xlock(&xprt->xp_lock); xprt->xp_tls = RPCTLS_FLAGS_HANDSHFAIL; sx_xunlock(&xprt->xp_lock); Modified: projects/nfs-over-tls/sys/rpc/svc_vc.c ============================================================================== --- projects/nfs-over-tls/sys/rpc/svc_vc.c Sun Jul 12 01:11:48 2020 (r363117) +++ projects/nfs-over-tls/sys/rpc/svc_vc.c Sun Jul 12 04:26:19 2020 (r363118) @@ -469,6 +469,14 @@ svc_vc_destroy_common(SVCXPRT *xprt) xprt->xp_sslusec, xprt->xp_sslrefno, &reterr); } + if ((xprt->xp_tls & (RPCTLS_FLAGS_HANDSHAKE | + RPCTLS_FLAGS_HANDSHFAIL)) != 0) { + /* Must sorele() to get rid of reference. */ + CURVNET_SET(xprt->xp_socket->so_vnet); + SOCK_LOCK(xprt->xp_socket); + sorele(xprt->xp_socket); + CURVNET_RESTORE(); + } } if (xprt->xp_netid) @@ -498,7 +506,8 @@ svc_vc_destroy(SVCXPRT *xprt) SOCKBUF_LOCK(&xprt->xp_socket->so_rcv); if (xprt->xp_upcallset) { xprt->xp_upcallset = 0; - soupcall_clear(xprt->xp_socket, SO_RCV); + if (xprt->xp_socket->so_rcv.sb_upcall != NULL) + soupcall_clear(xprt->xp_socket, SO_RCV); } SOCKBUF_UNLOCK(&xprt->xp_socket->so_rcv);