fs: fix adding security options to statmount.mnt_opt

commit 5eb987105357cb7cfa7cf3b1e2f66d5c0977e412 upstream.

Prepending security options was made conditional on sb->s_op->show_options,
but security options are independent of sb options.

Fixes: 056d33137bf9 ("fs: prepend statmount.mnt_opts string with security_sb_mnt_opts()")
Fixes: f9af549d1fd3 ("fs: export mount options via statmount()")
Cc: stable@vger.kernel.org # v6.11
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Link: https://lore.kernel.org/r/20250129151253.33241-1-mszeredi@redhat.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/namespace.c b/fs/namespace.c
index d390b8bbfdb9b84c5127fb4d8b3e88f215fb7388..5e678b8c89ad1a80f6abc5b6b6b15c56c55daf3b 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -5020,30 +5020,29 @@ static int statmount_mnt_opts(struct kstatmount *s, struct seq_file *seq)
 {
        struct vfsmount *mnt = s->mnt;
        struct super_block *sb = mnt->mnt_sb;
+       size_t start = seq->count;
        int err;
 
-       if (sb->s_op->show_options) {
-               size_t start = seq->count;
-
-               err = security_sb_show_options(seq, sb);
-               if (err)
-                       return err;
+       err = security_sb_show_options(seq, sb);
+       if (err)
+               return err;
 
+       if (sb->s_op->show_options) {
                err = sb->s_op->show_options(seq, mnt->mnt_root);
                if (err)
                        return err;
+       }
 
-               if (unlikely(seq_has_overflowed(seq)))
-                       return -EAGAIN;
+       if (unlikely(seq_has_overflowed(seq)))
+               return -EAGAIN;
 
-               if (seq->count == start)
-                       return 0;
+       if (seq->count == start)
+               return 0;
 
-               /* skip leading comma */
-               memmove(seq->buf + start, seq->buf + start + 1,
-                       seq->count - start - 1);
-               seq->count--;
-       }
+       /* skip leading comma */
+       memmove(seq->buf + start, seq->buf + start + 1,
+               seq->count - start - 1);
+       seq->count--;
 
        return 0;
 }