6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton jlayton@kernel.org
commit 056d33137bf9364456ee70aa265ccbb948daee49 upstream.
Currently these mount options aren't accessible via statmount().
The read handler for /proc/#/mountinfo calls security_sb_show_options() to emit the security options after emitting superblock flag options, but before calling sb->s_op->show_options.
Have statmount_mnt_opts() call security_sb_show_options() before calling ->show_options.
Signed-off-by: Jeff Layton jlayton@kernel.org Link: https://lore.kernel.org/r/20241115-statmount-v2-2-cd29aeff9cbb@kernel.org Signed-off-by: Christian Brauner brauner@kernel.org Stable-dep-of: 5eb987105357 ("fs: fix adding security options to statmount.mnt_opt") Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- fs/namespace.c | 4 ++++ 1 file changed, 4 insertions(+)
--- a/fs/namespace.c +++ b/fs/namespace.c @@ -5025,6 +5025,10 @@ static int statmount_mnt_opts(struct kst if (sb->s_op->show_options) { size_t start = seq->count;
+ err = security_sb_show_options(seq, sb); + if (err) + return err; + err = sb->s_op->show_options(seq, mnt->mnt_root); if (err) return err;