From nobody Fri Aug 26 03:35:37 2022 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 4MDQTQ1SVhz4bFr0; Fri, 26 Aug 2022 03:35: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 4MDQTQ0k35z3LYS; Fri, 26 Aug 2022 03:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661484938; 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=hpRulgEzp1mESVXxtXjcq1EyMswrjXsinMG2hdWNHfw=; b=Knoj7V+DaSl+c8HJ6/3LZDNGu11HmMDPsTFCdV/t9KwFFjM1oECOnVqDV5ggYv3U2JZOK7 as+lSa+rNoIB2TByOhEeW488A9xOVeohmhI2UORPPoFgqE/HcIuo4utjKB3iwJm+WASwOK PpqGm2HCBbZUeYPWtCnAc4z/mOd+kanR8kDoRjpUlcLo176lLjR3vhf8H3j3FYnw+HfCUS 6BzEOrbJCpLM4MCANXYRsJbJr0ZoBhfGtoRAyTVp1QmGIXwMlHCdGBUqrCkVJldU97FmU2 WNNYfY6VF9uAc4NoR3oIuLyUzWnWDbbuKpOavam7N6j359K6GNfcs+Z4FCrMXg== 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 4MDQTP6rP2z1C52; Fri, 26 Aug 2022 03:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27Q3ZbEN092357; Fri, 26 Aug 2022 03:35:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27Q3ZblC092356; Fri, 26 Aug 2022 03:35:37 GMT (envelope-from git) Date: Fri, 26 Aug 2022 03:35:37 GMT Message-Id: <202208260335.27Q3ZblC092356@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: 2b612c9d3bb5 - main - nfscl: Fix handling of a bad session slot (NFSv4.1/4.2) 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 2b612c9d3bb528551de9eaabbdbadae89a36ba8b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661484938; 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=hpRulgEzp1mESVXxtXjcq1EyMswrjXsinMG2hdWNHfw=; b=Aepokyhsc9zjhiN1INg/pl720FCWz9kxVzwei7rHUhzAcWMeXlzE1C/NJ53d3s5YlAEnOC 1dW7SKzMpUioYdM+/pbep+MQa4T4sO/jFkpQ7eMm5/75quT1dUMBhfb0+AADDSoEMhXkSP hDsCtRKUWFA0kMgtk+dqkEUC/w/Gb1Q8QPzenRe5N0WjKXRgiqeV9E8E8ZEZlbSOP57tps a61WEYNn2GPxDWk8Jobiu1VNaWGSyhXoQrvhH17p82A1Oj0WPCfjgMPzanWe+YUsLXmlAM r58mgaeDS36uvw9fcWLz2LaAa6wsfNIchsaDz/QVhSLxehVfX/IUDm4PMxPgjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661484938; a=rsa-sha256; cv=none; b=g+OHVzVAXDVIrVZKiQLcKTplDaPw6WhDLqnb+sqasV/64NyOh84d7LpX9qRZYPsstPMr1/ yWxHEow8LtrEd2ed08+pOlToUra0pv6NXfSAoXKX0wPoeOKqD02SzBW7QoQxw6ZH8uwCIw yqcRHsUG98nbtEjG0DBHcDDpkQXK8hHPqTUDPBQqhNGBiE7A5tNbhkYw+l00F+I9n5+mZs wCnKoxn0IfiDRhf2gfR8RvktTUP2YEuzl9nzScIb3y8hgRs25QaODbHD0AhK4X9rl3SAq4 jQEK4H5q/qwVqWvKgdTEpyvcQG+dc42PCCaaZa7XY9OfYtijHiC6u/PSEvGyNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2b612c9d3bb528551de9eaabbdbadae89a36ba8b commit 2b612c9d3bb528551de9eaabbdbadae89a36ba8b Author: Rick Macklem AuthorDate: 2022-08-26 03:33:31 +0000 Commit: Rick Macklem CommitDate: 2022-08-26 03:33:31 +0000 nfscl: Fix handling of a bad session slot (NFSv4.1/4.2) When a session has been marked defunct by the server sending a NFSERR_BADSESSION reply to the NFSv4.1/4.2 client, nfsv4_sequencelookup() returns NFSERR_BADSESSION without actually assigning a session slot. Without this patch, newnfs_request() would erroneously free slot 0. This could result in the slot being reused prematurely, but most likely just generated a "freeing free slot!!" console message. This patch fixes the code to not do the erroneous freeing of the slot for this case. PR: 260011 MFC after: 1 week --- sys/fs/nfs/nfs_commonkrpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 150d92414e7a..916d0182d3ee 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1080,12 +1080,12 @@ tryagain: } slot = nd->nd_slotid; } + freeslot = slot; } else if (slot != 0) { printf("newnfs_request: Bad " "session slot=%d\n", slot); slot = 0; } - freeslot = slot; if (retseq != sep->nfsess_slotseq[slot]) printf("retseq diff 0x%x\n", retseq);