linux-kernel - linux-next: manual merge of the fuse tree with Linus' 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: <20240226105535.2939b066@canb.auug.org.au>
Date: Mon, 26 Feb 2024 10:55:35 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miklos Szeredi <miklos@...redi.hu>
Cc: Al Viro <viro@...iv.linux.org.uk>, Alessio Balsini
 <balsini@...roid.com>, Amir Goldstein <amir73il@...il.com>, Linux Kernel
 Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Miklos Szeredi <mszeredi@...hat.com>
Subject: linux-next: manual merge of the fuse tree with Linus' tree

Hi all,

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

  fs/fuse/inode.c

between commit:

  053fc4f755ad ("fuse: fix UAF in rcu pathwalks")

from Linus' tree and commit:

  9fc953f59383 ("fuse: implement ioctls to manage backing files")

from the fuse 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/fuse/inode.c
index 516ea2979a90,c26a84439934..000000000000
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@@ -1373,7 -1395,9 +1402,9 @@@ EXPORT_SYMBOL_GPL(fuse_send_init)
  void fuse_free_conn(struct fuse_conn *fc)
  {
  	WARN_ON(!list_empty(&fc->devices));
+ 	if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))
+ 		fuse_backing_files_free(fc);
 -	kfree_rcu(fc, rcu);
 +	kfree(fc);
  }
  EXPORT_SYMBOL_GPL(fuse_free_conn);
  

Content of type "application/pgp-signature" skipped