From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 May 2026 20:49:13 +0000 (-0700)
Subject: Merge tag 'nfsd-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
X-Git-Tag: v7.1-rc6~30
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=eb3f4b7426cfd2b79d65b7d37155480b32259a11;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'nfsd-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

Pull nfsd fixes from Chuck Lever:
 "Regressions:

   - Tighten bounds checking for sunrpc cache hash tables

   - Don't report key material in the ftrace log

  Stable fix:

   - Fix lockd's implementation of the NLM TEST procedure"

* tag 'nfsd-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  lockd: fix TEST handling when not all permissions are available.
  NFSD: Report whether fh_key was actually updated
  sunrpc: prevent out-of-bounds read in __cache_seq_start()
---

eb3f4b7426cfd2b79d65b7d37155480b32259a11
diff --cc fs/lockd/svclock.c
index b98b1d0ada35f,44bc208370622..f4520149d6d79
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@@ -613,10 -613,9 +613,9 @@@ nlmsvc_testlock(struct svc_rqst *rqstp
  		struct nlm_lock *conflock)
  {
  	int			error;
- 	int			mode;
  	__be32			ret;
  
 -	dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",
 +	dprintk("lockd: nlmsvc_testlock(%s/%llu, ty=%d, %Ld-%Ld)\n",
  				nlmsvc_file_inode(file)->i_sb->s_id,
  				nlmsvc_file_inode(file)->i_ino,
  				lock->fl.c.flc_type,