From nobody Thu Nov 2 22:03:38 2023 X-Original-To: dev-commits-src-branches@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 4SLyZ23G87z4yTQw; Thu, 2 Nov 2023 22:03:38 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SLyZ22rp8z4Yg3; Thu, 2 Nov 2023 22:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698962618; 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=ilrO4OEdhIUyRhv9+/5aIZ/eZGz1KSejNG/XUj5l/lY=; b=HB0igTtdpkhResH2QbKQGKAWEwQF1kkpJwM0y9vs1pUJ25bK79JV5j3coILoTGhumNYt1G fNJolaYCU8Gj1aDL4n/NeXgfRWgnqUkReijbBfoKh3pwiviCp3fSeBf3SjkV5pxQN0LXPz stGe1CqxH8G6ZW/yFkDRHlfR3Nn8U0iStC7gDD+46qS3dqDHpZojuKoiDRXUHsuXCpSy/X OYQzVblzH394LFZuTgFl+xYWDDtY31u4zmekIIdBrctwkygYgU7FQdZxSDSXaJrv4izZp8 1VTqjFcu3wsZuxCdboEKtzuT9SleIoj3vNm8ELBRAFx0Nm4/jwHMlo0xstKAYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698962618; 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=ilrO4OEdhIUyRhv9+/5aIZ/eZGz1KSejNG/XUj5l/lY=; b=gF1I0vvCi0cA1sYNganAXE+euIGmnS2vkdz3BUAsHPtksjMiS90IZfbeKS5U7wxvfPNNG4 jEIJAsK9sO7RjaOXylI3MxoAgdpIcZEMl5vBCihN+0YBygIelGQ0titZdBKmbr88LF06it l5/21aKdUZqtEJFeR25JjHsR5EZbKo1pXVC14dWKp/fw3g87+bMGvX5zXywjXSFGUzRvYM TBhB75TAWFWwl2ZZNJ/TKXC6X7cM6boX4eeYpCD2pvCcJa41Pogghgc6EA6LMg0hrP2rpt wJN3t77n61ZWgtERZKE5MvJO8qUDN8n2z1A/ZKU0IufqiDb37MWm5LFU9dSvBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698962618; a=rsa-sha256; cv=none; b=Sfu3IJrie6xLwvgtvksSEmMr4pCfCWvLvydG2rhi0oVOMi5F665YxqN2wIF/nNFfFVTo7L f8A/X/RYnb1hLUb5SLkmuS1idqZTWCmQDc4e9eiRLCSDu7/LoM7N7NE/s/l2OTSyxju+Ha DLoHo0IIWaGy7/XeUh9GfolfyF8tfZ6qB+H/ANGFbFXAqPCN3tz2OKqP23fjDYE7zxqalV 14rkV1TzPon8AAMtqBdF9LGbLcIVYxSDH2EMbOBXKwL279vKgpcISXCq9jD3diNSwsmUPf lMh9PYj+nfHoFE4Io1AtB9pI+pMIdFfEBII88ctU5d1Qm1+KzC+rzxYtiA190A== 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 4SLyZ21whSzmN2; Thu, 2 Nov 2023 22:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A2M3ctP078547; Thu, 2 Nov 2023 22:03:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2M3cmZ078544; Thu, 2 Nov 2023 22:03:38 GMT (envelope-from git) Date: Thu, 2 Nov 2023 22:03:38 GMT Message-Id: <202311022203.3A2M3cmZ078544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 098273e649c6 - stable/14 - nfsd: Fix a server crash List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 098273e649c647d5472d518c5023477ad15b7c3f Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=098273e649c647d5472d518c5023477ad15b7c3f commit 098273e649c647d5472d518c5023477ad15b7c3f Author: Rick Macklem AuthorDate: 2023-10-18 02:40:23 +0000 Commit: Rick Macklem CommitDate: 2023-11-02 22:02:22 +0000 nfsd: Fix a server crash PR#274346 reports a crash which appears to be caused by a NULL default session being destroyed. This patch should avoid the crash. PR: 274346 (cherry picked from commit db7257ef972ed75e33929d39fd791d3699b53c63) --- sys/fs/nfs/nfs_commonkrpc.c | 9 +++++++++ sys/fs/nfs/nfs_commonsubs.c | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 936373c79366..29c7cdbd671c 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1208,6 +1208,14 @@ tryagain: NFSCL_DEBUG(1, "Got badsession\n"); NFSLOCKCLSTATE(); NFSLOCKMNT(nmp); + if (TAILQ_EMPTY(&nmp->nm_sess)) { + NFSUNLOCKMNT(nmp); + NFSUNLOCKCLSTATE(); + printf("If server has not rebooted, " + "check NFS clients for unique " + "/etc/hostid's\n"); + goto out; + } sep = NFSMNT_MDSSESSION(nmp); if (bcmp(sep->nfsess_sessionid, nd->nd_sequence, NFSX_V4SESSIONID) == 0) { @@ -1388,6 +1396,7 @@ tryagain: nd->nd_repstat = NFSERR_STALEDONTRECOVER; } } +out: #ifdef KDTRACE_HOOKS if (nmp != NULL && dtrace_nfscl_nfs234_done_probe != NULL) { diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index ffe1ec542492..f2305795e53e 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -5141,11 +5141,13 @@ nfsrpc_destroysession(struct nfsmount *nmp, struct nfsclsession *tsep, struct nfsrv_descript *nd = &nfsd; int error; + if (tsep == NULL) + tsep = nfsmnt_mdssession(nmp); + if (tsep == NULL) + return (0); nfscl_reqstart(nd, NFSPROC_DESTROYSESSION, nmp, NULL, 0, NULL, NULL, 0, 0, NULL); NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID); - if (tsep == NULL) - tsep = nfsmnt_mdssession(nmp); bcopy(tsep->nfsess_sessionid, tl, NFSX_V4SESSIONID); nd->nd_flag |= ND_USEGSSNAME; error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred,