linux-kernel - linux-next: manual merge of the vfs-brauner tree with the nfs-anna tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250109084503.1e046ef7@canb.auug.org.au>
Date: Thu, 9 Jan 2025 08:45:03 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christian Brauner <brauner@...nel.org>, Anna Schumaker
 <anna@...nel.org>, Trond Myklebust <trondmy@...il.com>
Cc: NFS Mailing List <linux-nfs@...r.kernel.org>, Anna Schumaker
 <anna.schumaker@...cle.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Mike Snitzer <snitzer@...nel.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the nfs-anna
 tree

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/nfsd/filecache.c

between commit:

  735aab1241ea ("nfsd: nfsd_file_acquire_local no longer returns GC'd nfsd_file")

from the nfs-anna tree and commits:

  f905e00904cc ("tree-wide: s/revert_creds()/put_cred(revert_creds_light())/g")
  51c0bcf0973a ("tree-wide: s/revert_creds_light()/revert_creds()/g")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/nfsd/filecache.c
index 2adf95e2b379,dc5c9d8e8202..000000000000
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@@ -1255,8 -1247,8 +1255,8 @@@ nfsd_file_acquire_local(struct net *net
  	__be32 beres;
  
  	beres = nfsd_file_do_acquire(NULL, net, cred, client,
 -				     fhp, may_flags, NULL, pnf, true);
 +				     fhp, may_flags, NULL, pnf, false);
- 	revert_creds(save_cred);
+ 	put_cred(revert_creds(save_cred));
  	return beres;
  }
  

Content of type "application/pgp-signature" skipped