From nobody Sat Dec 11 02:42:12 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 B602018E5E95; Sat, 11 Dec 2021 02:42:12 +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 4J9sVr2KJmz4XBH; Sat, 11 Dec 2021 02:42:12 +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 2EF8D2618D; Sat, 11 Dec 2021 02:42:12 +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 1BB2gCK1004525; Sat, 11 Dec 2021 02:42:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BB2gCFd004524; Sat, 11 Dec 2021 02:42:12 GMT (envelope-from git) Date: Sat, 11 Dec 2021 02:42:12 GMT Message-Id: <202112110242.1BB2gCFd004524@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: 9cd92bc5abde - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 9cd92bc5abdefb1897c3f948f50e66a3c21dff8e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639190532; 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=Yphomei2Duh+y7fRJpbt8iSE9yinrb2FcHvUNlx/Y7Y=; b=DTzcUftkWszQtsBPQG/Q3gNshL6TROUm3zUsSxk0mpdmgWp4HHgCPPS/uyKoKLe21/FGon jleSL5Lvy1DLsK6jnUvdUaE9rdAkNvFRmCpjQfyIx1HOy0KOQCLUzRMBi0JdsG3HW/6ENQ 2/YEoldMipfA7kdNCd//9F54kKoRurE9kou/TnXYfvmi3WupyW8prpgGDkXCl4Jucn3No/ hq0J1+rfXCZZFjjBi1v4MgTfCzARdzMG8wsyYE1hJiLQpFo2PMKI5oGosmt0HVjMlDcexB keJLiHSAZF+A6wvQvOzmPmq6+jHbDQcIpWIruNkNyppd5IpieFPdE5DMih3kng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639190532; a=rsa-sha256; cv=none; b=pdjgbwNeK7V5QlWmUmSzXX2oCwHFWEjMQ2JfPxGei8Axz7IMLZSFVgOAz4I8R6pmggrzWk vU2UkZcdzDsJ2E8lFEZxhr90mI09oUR6UjQyNXaC4eItheRN88RpXDlMydL7FkSY9oguKr gUpufsTPjnMaz7vFun638TH+2zMXO7wgOrYv4H9xK/Gr0zrf1lpkUKgbo5GzrVsMyZgj65 T7Un6zFtE5fm11h5eIN82iIqUuK+71s46bwFVg6bPH9kOAbXcnd8sn4H5Woe4bULgcMpxB FhF2ty7c7aFIfxLL6VhBf175mOkOwKKqLgtxclX5cNQtXLtaR8y4FciJZkv5NQ== 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=9cd92bc5abdefb1897c3f948f50e66a3c21dff8e commit 9cd92bc5abdefb1897c3f948f50e66a3c21dff8e Author: Rick Macklem AuthorDate: 2021-11-27 23:02:04 +0000 Commit: Rick Macklem CommitDate: 2021-12-11 02:38:11 +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. PR: 260071 (cherry picked from commit 1c15c8c0e935f3f7def7b03e9546f7d6790f465e) --- 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 12c2787b1eda..93d305f0547b 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -959,6 +959,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",