diff options
| author | Jeff Layton <jlayton@kernel.org> | 2024-11-15 10:35:53 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-17 11:36:59 +0100 |
| commit | 391d9e29690946e465ba518e7b424889720826f6 (patch) | |
| tree | 73e2ee1ed9f1a8888f3288a76ca040b1744a0454 | |
| parent | bf1aaf8eb546c633cf1186ad694bcefe1d6e679a (diff) | |
fs: prepend statmount.mnt_opts string with security_sb_mnt_opts()
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>
| -rw-r--r-- | fs/namespace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 30221f6b4a88..341d4348ab69 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -5042,6 +5042,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; |