From nobody Sat Nov 27 23:05:34 2021 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 58E8118A081A; Sat, 27 Nov 2021 23:05:35 +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 4J1nJv0VPfz3GNk; Sat, 27 Nov 2021 23:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E1752244ED; Sat, 27 Nov 2021 23:05:34 +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 1ARN5Yh5015203; Sat, 27 Nov 2021 23:05:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ARN5YtK015202; Sat, 27 Nov 2021 23:05:34 GMT (envelope-from git) Date: Sat, 27 Nov 2021 23:05:34 GMT Message-Id: <202111272305.1ARN5YtK015202@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: 1c15c8c0e935 - main - nfscl: Sanity check the Sequence slotid in reply 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: 1c15c8c0e935f3f7def7b03e9546f7d6790f465e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638054335; 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=FiKIWHng59RDF781C3QBiEUCA155bLfTeRvYyEDsiZE=; b=KDPegnPzlmQXrl0UPzlRf4N2dldTigyluBjf8t/XSqdcwai7CzY4gUQlVZjb2m1Jr5Ceh+ BPnvnOmgjl1UIqMptL6zBJGoYp9iin6a3ZpdxxVSc9wJvb3MyJgMcaXmOUzM2jGQT7yHuQ CUEp6lX1RmkJt8T9YcO38WYry0K8xjubxQ5a9B59MpK9SjsWETFm4fTeVwmGBnJX7mQuAa +pfF+HZA6Y8SdldbUFGmP2I3be2WuqtqvZKsx18Os5bqvX5EQywuVknuO5egUiGBDuYw+z 4UpYv2BNOJXeQAQgIBwXDLCUkpmjxOY64I9c5BrgzNhsf/Bv+6zJBQsa9P62mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638054335; a=rsa-sha256; cv=none; b=ya6A/KDpAgh77UHFvQlx5J84pPH3IGI6vM9+NhNJ/F5n4JmAHZGEEz3iQC+FbgHvpOx+0A g95tpU6ZtH3ROB09OwhoG4fcw07TxF0nh1VnYubUJKxNitivD9+SflXIaOlKj03PNr4cpF kClWEUMWGgkmN/CNT1agQiFI80yCC0v39bL5tSbTibh0hFlmfqkZdIVsviULdGop30RY2P Jb6wZNWuJ9QzGlUzFyiXof+r1eoGqaNSsm7+Eh9+gbrCkKotHqMJ/BznDoA/1cm4zpGDQj 1BZcaAcX+UnifueEZft7sqmTl6ousIQOs2/x9hWAHVd1j4VQ6lnXMVT+lesljw== 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=1c15c8c0e935f3f7def7b03e9546f7d6790f465e commit 1c15c8c0e935f3f7def7b03e9546f7d6790f465e Author: Rick Macklem AuthorDate: 2021-11-27 23:02:04 +0000 Commit: Rick Macklem CommitDate: 2021-11-27 23:02:04 +0000 nfscl: Sanity check the Sequence slotid in reply The slotid in the Sequence reply must be the same as in the request. Check that it is the same and log a console message if it is not, plus set it to the correct value. Reported by: rtm@lcs.mit.edu Tested by: rtm@lcs.mit.edu PR: 260071 MFC after: 2 weeks --- sys/fs/nfs/nfs_commonkrpc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index c1a5fab2a358..4d8db64f419f 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1038,6 +1038,18 @@ tryagain: tl += NFSX_V4SESSIONID / NFSX_UNSIGNED; retseq = fxdr_unsigned(uint32_t, *tl++); slot = fxdr_unsigned(int, *tl++); + if ((nd->nd_flag & ND_HASSLOTID) != 0) { + if (slot != nd->nd_slotid) { + printf("newnfs_request:" + " Wrong session " + "slot=%d\n", slot); + slot = nd->nd_slotid; + } + } 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",