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
Date: Mon, 26 Feb 2024 10:55:35 +1100 [thread overview]
Message-ID: <20240226105535.2939b066@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]
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);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-02-25 23:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-25 23:55 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-29 22:32 linux-next: manual merge of the fuse tree with Linus' tree Stephen Rothwell
2025-02-05 8:59 ` Joel Granados
2024-03-05 23:34 Stephen Rothwell
2024-03-07 14:16 ` Miklos Szeredi
2024-03-07 21:34 ` Stephen Rothwell
2022-10-12 22:59 Stephen Rothwell
2020-10-12 23:47 Stephen Rothwell
2020-10-13 11:22 ` Max Reitz
2020-02-06 21:54 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240226105535.2939b066@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amir73il@gmail$(echo .)com \
--cc=balsini@android$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox