Received-SPF: pass (google.com: domain of linux-kernel+bounces-93113-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Wed, 6 Mar 2024 10:34:38 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: Al Viro <viro@zeniv.linux.org.uk>, Alessio Balsini
 <balsini@android.com>, Amir Goldstein <amir73il@gmail.com>, Linux Kernel
 Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Miklos Szeredi <mszeredi@redhat.com>
Subject: linux-next: manual merge of the fuse tree with Linus' tree
Message-ID: <20240306103438.2c0a6f44@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/LkBvSJcC./c/m5YCppuATU5";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/LkBvSJcC./c/m5YCppuATU5
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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:

  44350256ab94 ("fuse: implement ioctls to manage backing files")

from the fuse tree.

I fixed it up (I think? 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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/fuse/inode.c
index 516ea2979a90,02869edf72f3..000000000000
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@@ -930,14 -942,6 +942,16 @@@ void fuse_conn_init(struct fuse_conn *f
  }
  EXPORT_SYMBOL_GPL(fuse_conn_init);
 =20
 +static void delayed_release(struct rcu_head *p)
 +{
 +	struct fuse_conn *fc =3D container_of(p, struct fuse_conn, rcu);
 +
 +	put_user_ns(fc->user_ns);
++	if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))
++		fuse_backing_files_free(fc);
 +	fc->release(fc);
 +}
 +
  void fuse_conn_put(struct fuse_conn *fc)
  {
  	if (refcount_dec_and_test(&fc->count)) {

--Sig_/LkBvSJcC./c/m5YCppuATU5
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXnrA4ACgkQAVBC80lX
0Gy2Nwf7BIw0m7aawt3swN1ahcp9amUY30AMU9AT44OzzPpdAZN/KVNfSor7Vbx4
/r4pSuPKPvINYPWtrDmLCu69aIDbHH1EAD5eziFGOVFjaam/z7fepkG2ZLpcg5cH
DJtIa48uojDQiFZk4LiFamFY23Up39Df8Xxjw1HCbAA5vHsC0DgMeRpZ6zxxPE5t
27o+jR/mwLijGVmfTGx7HuGdOta0VGpTgkZbo4jYaplEwkzDvxLMJd71ZwJBBYFB
HAfGGSpqkrG4A+EhsO7KrSB1VSUMrqgMTAgkM0E3HBx2Mh25BXnR0M4Ibz0+5Sna
xQPm7V57gGMyVGlQIynIVrgLgt/O/g==
=cECx
-----END PGP SIGNATURE-----

--Sig_/LkBvSJcC./c/m5YCppuATU5--