From nobody Wed Oct 18 02:44:09 2023 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 4S9FY5351Lz4xNBm; Wed, 18 Oct 2023 02:44:09 +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 4S9FY52YCsz4YRR; Wed, 18 Oct 2023 02:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697597049; 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=qBIGizAExzLhhoLqHyKbDFKO5c0qXZzV7xugcE6Sv14=; b=e/jQy/ee02dKokq4h/18/SUqZP7hxV2i+ANul4UtplcuNvytIhLqJLDct2QUR/jyv9VjfH RBTgTsTniX1B3cOEHVi0lTZMR9M0SBdHYKBpnIOyFpdguE/gjRridMVtb3F0FDWk3cwYDY R3llkOE9fEhiKjZ5yhddMIVhaIkUeRsTuMZnN7Tm0ghviV/ATTQKwqLrDosWogxnrETl8t QY6ODbOYJR/nknhNtlVFplBVBFqWD0DGatHe+lui79Md59oHyPamS6RkabRNUVKchdvw6R VAFPEqzx7zLprygOr6YPNPCs38cNFAcMAIVM8oEX1aU9b3WEcGwQITcO0rcWuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697597049; a=rsa-sha256; cv=none; b=uyABDBmf8bAhA0CkvmlPaLm8gCRFKJd1wCnJdyNRa+y9DVK+8JneAgOqjrEVzLZEFln5+h U7uwmLHbHUz03KTtDj0MChuE0Rzd5YloLyc2cAYk7S/ro0mO1jzQUKZnpEsjpfnKoyGXCF 5m7sJKvc1WMiGbJ08RwiL9c8SaGbiFB4FEh2Bmu6Ka8LG2Rl73ASSqBCZ85RxR5CS9VjxH DSe4bqhFSv4vKtyztukx0riJIJMlbXqbrBfxrb2vueeD1dpEglk71+qQoHG+0Kg6zm3FOK qDjJSZg/uwkmdAZ/O2vWLAASs5nTOLeKQ+/2JRGEGS8D6eX1qRkofdCh1aTUtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697597049; 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=qBIGizAExzLhhoLqHyKbDFKO5c0qXZzV7xugcE6Sv14=; b=t416h5cnAGOHzaBUJdsjXGrK8iQrc6Dg11Qlest7GLxsPjogQXDF8pBlIo0oVLT62qgWBG 2ELrkckZaTDjnh3hU4L/eIf6Fj9unLPJ9QUJzgnNqX0zFCEgOP8lPQliAccQ96NUdC3LYs Aif9GylnUtqvfKhyiNXOZOMTTbLO63vVMlRLuGW5C69uv7Clhh4JGq6ab1JfAzTFs0TywC M6fE8Urrl+qRIFUpeZcLcF58+rI0Kh+CUb4FoQrxqb+hb435DoKWXusyT1BZK6i6JyZY3e cWiz3wL7ViyPNWP5l/ldp/6zFpCcr6bHhMsHuWeRjn7yomG52wpMjryFqPtioQ== 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 4S9FY51b4tzqFH; Wed, 18 Oct 2023 02:44:09 +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 39I2i9lI010368; Wed, 18 Oct 2023 02:44:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I2i9Pm010365; Wed, 18 Oct 2023 02:44:09 GMT (envelope-from git) Date: Wed, 18 Oct 2023 02:44:09 GMT Message-Id: <202310180244.39I2i9Pm010365@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: db7257ef972e - main - nfsd: Fix a server crash 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: db7257ef972ed75e33929d39fd791d3699b53c63 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=db7257ef972ed75e33929d39fd791d3699b53c63 commit db7257ef972ed75e33929d39fd791d3699b53c63 Author: Rick Macklem AuthorDate: 2023-10-18 02:40:23 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 02:43:25 +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. Tested by: Joshua Kinard PR: 274346 MFC after: 2 weeks --- 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,