From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>,
Christian Brauner <brauner@kernel•org>
Cc: Aleksa Sarai <cyphar@cyphar•com>,
Askar Safin <safinaskar@zohomail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the vfs tree with the vfs-brauner tree
Date: Fri, 5 Sep 2025 09:48:34 +1000 [thread overview]
Message-ID: <20250905094834.46d58f55@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2440 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/namespace.c
between commits:
807602d8cfc8 ("vfs: output mount_too_revealing() errors to fscontext")
1e5f0fb41fcc ("vfs: fs/namespace.c: remove ms_flags argument from do_remount")
from the vfs_brauner tree and commits:
5423426a79dd ("switch do_new_mount_fc() to fc_mount()")
308a022f41bd ("do_new_mount_fc(): use __free() to deal with dropping mnt on failure")
ead5706f63cd ("do_{loopback,change_type,remount,reconfigure_mnt}(): constify struct path argument")
from the vfs 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/namespace.c
index 92980f758fd4,aeeb33bf3e7b..000000000000
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@@ -3298,7 -3310,7 +3319,7 @@@ static int do_reconfigure_mnt(const str
* If you've mounted a non-root directory somewhere and want to do remount
* on it - tough luck.
*/
- static int do_remount(struct path *path, int sb_flags,
-static int do_remount(const struct path *path, int ms_flags, int sb_flags,
++static int do_remount(const struct path *path, int sb_flags,
int mnt_flags, void *data)
{
int err;
@@@ -3738,30 -3720,20 +3729,22 @@@ static int do_new_mount_fc(struct fs_co
if (IS_ERR(mnt))
return PTR_ERR(mnt);
+ sb = fc->root->d_sb;
+ error = security_sb_kern_mount(sb);
+ if (unlikely(error))
+ return error;
+
- if (unlikely(mount_too_revealing(sb, &mnt_flags)))
++ if (unlikely(mount_too_revealing(sb, &mnt_flags))) {
++ errorfcp(fc, "VFS", "Mount too revealing");
+ return -EPERM;
++ }
+
mnt_warn_timestamp_expiry(mountpoint, mnt);
- error = lock_mount(mountpoint, &mp);
- if (!error) {
- error = do_add_mount(real_mount(mnt), mp.mp,
- mountpoint, mnt_flags);
- unlock_mount(&mp);
- }
- if (error < 0)
- mntput(mnt);
+ LOCK_MOUNT(mp, mountpoint);
+ error = do_add_mount(real_mount(mnt), &mp, mnt_flags);
+ if (!error)
+ retain_and_null_ptr(mnt); // consumed on success
return error;
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-04 23:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-04 23:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-04-08 12:43 linux-next: manual merge of the vfs tree with the vfs-brauner tree Mark Brown
2026-04-08 17:16 ` Al Viro
2026-04-08 17:32 ` Mark Brown
2026-01-19 13:45 Mark Brown
2026-01-14 22:38 Stephen Rothwell
2025-11-20 21:47 Stephen Rothwell
2025-11-20 21:42 Stephen Rothwell
2025-11-20 21:33 Stephen Rothwell
2025-11-20 21:27 Stephen Rothwell
2025-09-25 12:35 Mark Brown
2025-09-24 9:04 Mark Brown
2025-09-24 8:58 Mark Brown
2025-09-22 8:58 Mark Brown
2025-07-07 23:38 Stephen Rothwell
2025-07-08 0:25 ` Al Viro
2025-07-08 0:45 ` Al Viro
2025-07-08 8:15 ` Christian Brauner
2025-05-16 0:02 Stephen Rothwell
2025-01-19 23:41 Stephen Rothwell
2025-01-20 9:21 ` David Howells
2023-12-19 23:41 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=20250905094834.46d58f55@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=cyphar@cyphar$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=safinaskar@zohomail$(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