[Devel] [PATCH RHEL10 COMMIT] ms/fs: prepend statmount.mnt_opts string with security_sb_mnt_opts()

[Konstantin Khorenko]

The commit is pushed to "branch-rh10-6.12.0-211.30.1.14.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-211.30.1.14.1.vz10
------>
commit d75e1d8ed731a9dc39bd448aca45822d12e8f24c
Author: Jeff Layton <jlayton at kernel.org>
Date:   Sun May 24 18:26:01 2026 +0300

    ms/fs: prepend statmount.mnt_opts string with security_sb_mnt_opts()
    
    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 at kernel.org>
    Link: https://lore.kernel.org/r/20241115-statmount-v2-2-cd29aeff9cbb@kernel.org
    Signed-off-by: Christian Brauner <brauner at kernel.org>
    
    (cherry picked from commit 056d33137bf9364456ee70aa265ccbb948daee49)
    https://virtuozzo.atlassian.net/browse/VSTOR-132443
    Feature: Fix selftests
    Signed-off-by: Eva Kurchatova <eva.kurchatova at virtuozzo.com>
    Reviewed-by: Vasileios Almpanis <vasileios.almpanis at virtuozzo.com>
---
 fs/namespace.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fs/namespace.c b/fs/namespace.c
index 566f11a222fcf..9dc36c065013f 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -5358,6 +5358,10 @@ static int statmount_mnt_opts(struct kstatmount *s, struct seq_file *seq)
 	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;