From nobody Sat Jul 19 14:54:21 2025 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 4bkqSG59J7z61vkB; Sat, 19 Jul 2025 14:54:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bkqSF6TMPz41rF; Sat, 19 Jul 2025 14:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752936861; 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=EPjOLmuClH3UcV0vSaA/JBuKHdnTHvLKcXijbOJbG/U=; b=x8PgqXKDOHfQytoTaWe/Jbp4Jei0RAKiRHjygPB8I0wH2/ok5pAVnLlaDCDdyKIxU/iO7d kktraRz2aVdeW6vtbrT0QXl9w0gVh9SPFLGozm8UcaN7IGsEV8hVVbDQpz/rYgymjNFCZ6 NHlnSLk1UWzkRtG2ZMrXYdsWEodtGKW6br0gEW/CMqFmc+GBVNWugVg/yvy0/SC1eKI+c5 baAsXGKOToHkq1rRlzGHQhXGmrmGqGHgNWqi8wJTzcePtQvfS6Tyzyck6KMJRuHivddFjZ TKaptS14H2oLP9aOTvXjtbLAtmZow0YIQdebUJNrhV46HRqGsw+6RsSMxls2Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752936861; 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=EPjOLmuClH3UcV0vSaA/JBuKHdnTHvLKcXijbOJbG/U=; b=LmooHfU20Y65duya8hERUa/1/RcBbLk+F1xShABWZLNPGo+trm3h5ydLszNC/ZnlkSpwyi Z5O116LwVfAQLZaNYH6fbHvCwxk7vucf1CfEZhd/KD+U9QPgR86ZsYFYissrBuS+TnTC9r Cy0+Iz5M3uRb18cn5Kcmpy51diS5NO2i10GH0b67cr7l8C2YMB/Z46YhuDaecpISC8JC4T 6LqhLRSsEoLy7eXi5lnkZB0ivGXTR9BCo+NlcC186jill+roMDwMonYhePu03bttrDQ/2P yzNytDXBVUqnaU7eBDnESg/2OH0f3MfN5nA4EZ0rKjTCXoHrkcOu/6Xrpar83A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752936861; a=rsa-sha256; cv=none; b=XEgLiUwpo61WzExnBtR9B2Ph1pL8aldFUie+PSmL9j8TVLmagWrCtNYhQlBwWiNl2ivGxm nDuf/jNYoomhLDShQxW+MZK6m8kj/tdwLXjGjR0y7Cx7Gd7R7SUkvmZ23W5Xe8UiUJ/fWI SpSB2twZCpim7+vhm0K1K+AQryQ0jbJyMTnEWexLBBBtmJ73YBMzj5ryY6WpqHjIFBeyC+ DolesAkSTWftFMFdj5c6Zvn7gJN1jFnR6ltj+8aKey0wHgCCdA7H95O3uTI6PCKAhwKR+I FdLKoglMkkP+PZ7RZn9whd/NP901qgbhlaemmStuQ3C5OB6xr6qZHLLYvFLQAg== 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 4bkqSF5XcwzXMb; Sat, 19 Jul 2025 14:54:21 +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 56JEsLQf017502; Sat, 19 Jul 2025 14:54:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56JEsL0p017498; Sat, 19 Jul 2025 14:54:21 GMT (envelope-from git) Date: Sat, 19 Jul 2025 14:54:21 GMT Message-Id: <202507191454.56JEsL0p017498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: a28a65140f11 - main - rpcsec_gss.c: Avoid panics in clnt_nl_call() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a28a65140f11b54c4555d7c30ef5ae42fdf4c8a0 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a28a65140f11b54c4555d7c30ef5ae42fdf4c8a0 commit a28a65140f11b54c4555d7c30ef5ae42fdf4c8a0 Author: Rick Macklem AuthorDate: 2025-07-19 14:51:40 +0000 Commit: Rick Macklem CommitDate: 2025-07-19 14:51:40 +0000 rpcsec_gss.c: Avoid panics in clnt_nl_call() When rpc_gss_init() calls gssd upcall functions like gssd_import_name(), clnt_nl_call() gets calls. clnt_nl_call() requires that the currect vnet be set up. The calling sequence looks something like: rpc_gss_init()->gssd_import_name()->gssd_import_name_1()-> clnt_call_private()->clnt_nl_call() (The call to rpc_gss_init() can happen from various places, such as nfs_getauth() and clnt_vc_call().) rpc_gss_init() does not know what socket is being used for NFS client->server RPCs and may be called from various places when any VOP_xxx()->RPC call is made. As such, the calling thread might be running within a jail. However, the gssd upcalls for the NFS client must always be done to the gssd running outside of any jails. This patch sets the CURVNET to vnet0 in rpc_gss_init() to fix the problem, since that is the vnet that always should be used. This must somehow be changed if NFS mounts in vnet jails is enabled. Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D51086 --- sys/rpc/rpcsec_gss/rpcsec_gss.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss.c b/sys/rpc/rpcsec_gss/rpcsec_gss.c index 62c71937a185..983dd251f81f 100644 --- a/sys/rpc/rpcsec_gss/rpcsec_gss.c +++ b/sys/rpc/rpcsec_gss/rpcsec_gss.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -771,6 +772,17 @@ rpc_gss_init(AUTH *auth, rpc_gss_options_ret_t *options_ret) gd->gd_cred.gc_proc = RPCSEC_GSS_INIT; gd->gd_cred.gc_seq = 0; + /* + * XXX Threads from inside jails can get here via calls + * to clnt_vc_call()->AUTH_REFRESH()->rpc_gss_refresh() + * but the NFS mount is always done outside of the + * jails in vnet0. Since the thread credentials won't + * necessarily have cr_prison == vnet0 and this function + * has no access to the socket, using vnet0 seems the + * only option. This is broken if NFS mounts are enabled + * within vnet prisons. + */ + KGSS_CURVNET_SET_QUIET(vnet0); /* * For KerberosV, if there is a client principal name, that implies * that this is a host based initiator credential in the default @@ -994,12 +1006,14 @@ out: gss_delete_sec_context(&min_stat, &gd->gd_ctx, GSS_C_NO_BUFFER); } + KGSS_CURVNET_RESTORE(); mtx_lock(&gd->gd_lock); gd->gd_state = RPCSEC_GSS_START; wakeup(gd); mtx_unlock(&gd->gd_lock); return (FALSE); } + KGSS_CURVNET_RESTORE(); mtx_lock(&gd->gd_lock); gd->gd_state = RPCSEC_GSS_ESTABLISHED;