From nobody Fri Sep 2 02:15:27 2022 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 4MJhMg3Gz9z4bSGS; Fri, 2 Sep 2022 02:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MJhMg2m1Nz3Gnj; Fri, 2 Sep 2022 02:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662084927; 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=ZA+j4HQgq8lAKz7lwVhfhkmhT5cQrL1F48UDIYkCdmQ=; b=EpdmNovWnYZ1RdshOtF0Bd/9VUJlwCcc55ZcMaRKR6i+zGztYtFpcfZjrMlt8rR6B2geRB bM46iS4eWOF2/qK5vRBV+3bVFZB3dfFOxUNCkEoemmCZvenp1+rrTLYsc+h6ZWf0JGrdwq 3ee794bECREFq+zd5Xx92zG1pTBt2ULOH2h0ZTqig7sKcTT8gqgqSSnAEfW6MqC0o+xPWz UE3NQMLACyh7XoWm5BcWVQxFSgYhzVDhdbHJbdaaIp6fnfQhZdI15rDm0dKBRLG4XIc7Uw ceEFjYToe1VmMAqaVauo4P/Yv7mzODv1IHWH96Bba/tX7dorr/yzr/47XDUdqA== 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 4MJhMg1pyHzgFM; Fri, 2 Sep 2022 02:15:27 +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 2822FRVS075243; Fri, 2 Sep 2022 02:15:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2822FR0E075242; Fri, 2 Sep 2022 02:15:27 GMT (envelope-from git) Date: Fri, 2 Sep 2022 02:15:27 GMT Message-Id: <202209020215.2822FR0E075242@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: e1dd3e568789 - stable/12 - nfscl: Fix handling of a bad session slot (NFSv4.1/4.2) 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/stable/12 X-Git-Reftype: branch X-Git-Commit: e1dd3e56878907f4321fa5456eb23914673dc930 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662084927; 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=ZA+j4HQgq8lAKz7lwVhfhkmhT5cQrL1F48UDIYkCdmQ=; b=P1JJxOZqGJcGcl1vhU9MdwvokhhtLeDRNKvOj+sD0YKKTBxEl/g0gXy0ouz/K6zHGAs6Ay tCkbxHSlVOUgedl4SOWgjl9IwXryBVW0A8jOVdQAalVeybNftpivkoo04kweD+Yp9YvS9s lFM5uRUIUzsqk8lJzvWVrH5d+2U4oiLYMjC+tD0ymPf42grwAEgD7MgBWWq5hNOpooR/3Q lkqUuXvCH7B5UXT+PfgZoQV80sYhOxOOlsJ2BdsE3zAeeV8mPvPUDZabNUb4Czk1umFAu8 /4QNLN91Lt33y+8V0pr9Pye/JdWqoDi+QZjDwl2bKANlWtiQ6yxPniFUVYi0Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662084927; a=rsa-sha256; cv=none; b=s2TqfwE8z4lA8F8+jm5G+JnidnjSi3EH1lwsWFBG3XOxIQ130pnEF0ffWKDkTaqqrM4fQ9 nbnPQl40HRPTnvmMd7bI6lCrVcahlOeVv9pT/wyYAqe0GGf3j97w//7d819EezJKovP60j ShAtqA65un84F4tFWKHfLW5X+mMm+wN1uWjbNaAMZSVp3UrHkCYg0uaJMaWEoasAPKXmW2 nbPI2O9hnkY1WASAkJm1BDNN9/yVPGmnZeKPWig8sW6/xdjxGRzvRNKMMKqniXTv2rvc9l E4+6GaApVyaN+PA1g8QXtXNrw/2DTFq1+2DwTmXlvHA8E4Gu3pYtK/k/yYNibg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=e1dd3e56878907f4321fa5456eb23914673dc930 commit e1dd3e56878907f4321fa5456eb23914673dc930 Author: Rick Macklem AuthorDate: 2022-08-26 03:33:31 +0000 Commit: Rick Macklem CommitDate: 2022-09-02 02:12:21 +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 (cherry picked from commit 2b612c9d3bb528551de9eaabbdbadae89a36ba8b) --- 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 93d305f0547b..934e964b35d6 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -966,12 +966,12 @@ tryagain: "slot=%d\n", slot); 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);