From nobody Sat Feb 01 09:02:26 2025 X-Original-To: dev-commits-src-main@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 4YlRbl5dSbz5mbJ0; Sat, 01 Feb 2025 09:02:27 +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 4YlRbl02Dfz41cW; Sat, 01 Feb 2025 09:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738400547; 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=r6vBMmjs5izG7P4Y/m1j88mCTLZiy6NjKPV/GpJB3S4=; b=Cx6+e7ZnR1VXtHazBxfH1Re+K4cQ9uOWHIJfcih/HTaX09x6sRdgBVD1f5xUB6Rez8nUWb hLpj801hpjGE78ei2EgkJHyM4ChTFxhBaSITWThBHkWkDWly+GvYJzN7gtdCQS8pMyoIW+ OUy6WmZdBABbYGlCu3Sy0FChrl/+tvxmpQBiaISgeh7I8iM8YaaGpoVOwnJI/y9+rkcFY7 0ZtaNHw/vuLnJzqYgAb252uFi4aVZytWSwSa4PkhBK10C2JAGLPHHFrVIXX2XV2wa8kA4z QzbY4ym6HDM64/CH66YEWUFQ6KHanOS5JuI61Iya/rzfPvvYf0lfQ7iL0vyr/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738400547; 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=r6vBMmjs5izG7P4Y/m1j88mCTLZiy6NjKPV/GpJB3S4=; b=s/gRI12EWdiaOIUclXI9zmkpbwkidAqZyi1IJJk+ejUYYHOseZBoxm9AkvWK2wnHQGhevS ff5MK2FlSncI+UAMm9w1Sh56MsHiE06D2AS8U65O0s1axAEKW92Ang48u1BuAV7wpfe9E1 Q+IwP2VbIaizyUbmpztlbkl+RAXnArb5JgudTZ7aowDxOOedBsIOUMAAxTWDFHbE3PKDEa emYRSbQF1KentrdQ+zYPYemLMx71PaOXZQecmU3Q/hMiMEob4Et40tfG12YVJZHKrISBZO UmiWuLBbpxRfOLtu49IlQvzEkoq2e/RVrFRsXbv938fUYBJvtsYEZRGyDNm1Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738400547; a=rsa-sha256; cv=none; b=GuLiL7sBPEI3wC6EWhbIu2h2YumZKDdienyW9NaN9DBSuAfvnNvzSjADCs9NhzEcFEDa5a bYMU8Qbw8fdvqiisAkXWfmjvXiKf68xYTinU/eJp2GTBpl6tyCGSr6s0kty6xrvfcUt3/d L5ldsiU4w8YzvXBExR24IMJ9ghlO1ZJcDTC8TkFvCE+0a9A2CD8MpGVZ32oCZvtcA00CRn d0kw0nebdtqqRJ5nSRi00vU6pD/fjc+XfVey9lD+gDrhDxXzlmsWwoEQrRWQS7EFBw1CPX PlncbIrc+aEpGsIUcM4SKCp7vfZbRn8h7hmP0WY+jE5nEuHh7kr/8JE0gSotZA== 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 4YlRbk6lXGzxNK; Sat, 01 Feb 2025 09:02:26 +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 51192Qn2048452; Sat, 1 Feb 2025 09:02:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51192QqC048449; Sat, 1 Feb 2025 09:02:26 GMT (envelope-from git) Date: Sat, 1 Feb 2025 09:02:26 GMT Message-Id: <202502010902.51192QqC048449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 75a884f47cf8 - main - rpcsec_tls: merge RPC failure for rpctls_connect() and rpctls_server() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75a884f47cf808e0c049da126dec349c1596ab57 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=75a884f47cf808e0c049da126dec349c1596ab57 commit 75a884f47cf808e0c049da126dec349c1596ab57 Author: Gleb Smirnoff AuthorDate: 2025-02-01 01:03:15 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-01 09:00:27 +0000 rpcsec_tls: merge RPC failure for rpctls_connect() and rpctls_server() Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D48677 --- sys/rpc/rpcsec_tls/rpctls_impl.c | 100 ++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 54 deletions(-) diff --git a/sys/rpc/rpcsec_tls/rpctls_impl.c b/sys/rpc/rpcsec_tls/rpctls_impl.c index 9d2d154f8738..49464495ad58 100644 --- a/sys/rpc/rpcsec_tls/rpctls_impl.c +++ b/sys/rpc/rpcsec_tls/rpctls_impl.c @@ -228,6 +228,35 @@ sys_rpctls_syscall(struct thread *td, struct rpctls_syscall_args *uap) return (error); } +/* Error handling for both client and server failed RPC upcalls. */ +static void +rpctls_rpc_failed(struct upsock *ups, struct socket *so) +{ + + mtx_lock(&rpctls_lock); + if (RB_FIND(upsock_t, &upcall_sockets, ups)) { + struct upsock *removed __diagused; + + removed = RB_REMOVE(upsock_t, &upcall_sockets, ups); + mtx_unlock(&rpctls_lock); + MPASS(removed == ups); + /* + * Do a shutdown on the socket, since the daemon is + * probably stuck in SSL_accept() trying to read the + * socket. Do not soclose() the socket, since the + * daemon will close() the socket after SSL_accept() + * returns an error. + */ + soshutdown(so, SHUT_RD); + } else { + /* + * The daemon has taken the socket from the tree, but + * failed to do the handshake. + */ + mtx_unlock(&rpctls_lock); + } +} + /* Do an upcall for a new socket connect using TLS. */ enum clnt_stat rpctls_connect(CLIENT *newclient, char *certname, struct socket *so, @@ -269,39 +298,20 @@ rpctls_connect(CLIENT *newclient, char *certname, struct socket *so, arg.certname.certname_len = 0; arg.socookie = (uint64_t)so; stat = rpctlscd_connect_2(&arg, &res, cl); - if (stat == RPC_SUCCESS) { -#ifdef INVARIANTS - MPASS((RB_FIND(upsock_t, &upcall_sockets, &ups) == NULL)); -#endif + if (stat == RPC_SUCCESS) *reterr = res.reterr; - } else { - mtx_lock(&rpctls_lock); - if (RB_FIND(upsock_t, &upcall_sockets, &ups)) { - struct upsock *removed __diagused; - - removed = RB_REMOVE(upsock_t, &upcall_sockets, &ups); - mtx_unlock(&rpctls_lock); - MPASS(removed == &ups); - /* - * Do a shutdown on the socket, since the daemon is - * probably stuck in SSL_accept() trying to read the - * socket. Do not soclose() the socket, since the - * daemon will close() the socket after SSL_accept() - * returns an error. - */ - soshutdown(so, SHUT_RD); - } else { - /* - * The daemon has taken the socket from the tree, but - * failed to do the handshake. - */ - mtx_unlock(&rpctls_lock); - } - } + else + rpctls_rpc_failed(&ups, so); /* Unblock reception. */ CLNT_CONTROL(newclient, CLSET_BLOCKRCV, &(int){0}); +#ifdef INVARIANTS + mtx_lock(&rpctls_lock); + MPASS((RB_FIND(upsock_t, &upcall_sockets, &ups) == NULL)); + mtx_unlock(&rpctls_lock); +#endif + return (stat); } @@ -397,9 +407,6 @@ rpctls_server(SVCXPRT *xprt, uint32_t *flags, uid_t *uid, int *ngrps, arg.socookie = (uint64_t)xprt->xp_socket; stat = rpctlssd_connect_2(&arg, &res, cl); if (stat == RPC_SUCCESS) { -#ifdef INVARIANTS - MPASS((RB_FIND(upsock_t, &upcall_sockets, &ups) == NULL)); -#endif *flags = res.flags; if ((*flags & (RPCTLS_FLAGS_CERTUSER | RPCTLS_FLAGS_DISABLED)) == RPCTLS_FLAGS_CERTUSER) { @@ -410,32 +417,17 @@ rpctls_server(SVCXPRT *xprt, uint32_t *flags, uid_t *uid, int *ngrps, for (i = 0; i < *ngrps; i++) *gidp++ = *gidv++; } - } else { - mtx_lock(&rpctls_lock); - if (RB_FIND(upsock_t, &upcall_sockets, &ups)) { - struct upsock *removed __diagused; + } else + rpctls_rpc_failed(&ups, xprt->xp_socket); - removed = RB_REMOVE(upsock_t, &upcall_sockets, &ups); - mtx_unlock(&rpctls_lock); - MPASS(removed == &ups); - /* - * Do a shutdown on the socket, since the daemon is - * probably stuck in SSL_accept() trying to read the - * socket. Do not soclose() the socket, since the - * daemon will close() the socket after SSL_accept() - * returns an error. - */ - soshutdown(xprt->xp_socket, SHUT_RD); - } else { - /* - * The daemon has taken the socket from the tree, but - * failed to do the handshake. - */ - mtx_unlock(&rpctls_lock); - } - } mem_free(res.gid.gid_val, 0); +#ifdef INVARIANTS + mtx_lock(&rpctls_lock); + MPASS((RB_FIND(upsock_t, &upcall_sockets, &ups) == NULL)); + mtx_unlock(&rpctls_lock); +#endif + return (stat); }