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 10:05:48 +0100 |
| commit | 45439a8b1115522a071f227dda8bd52699dadfee (patch) | |
| tree | 06e1f409a44dc14ecaafba7e8c4e04bbe1a542a5 /fs | |
| parent | bdea9e692de57d6c42ecd62061d2e98fb968159c (diff) | |
| download | linux-45439a8b1115522a071f227dda8bd52699dadfee.tar.gz linux-45439a8b1115522a071f227dda8bd52699dadfee.tar.bz2 linux-45439a8b1115522a071f227dda8bd52699dadfee.zip | |
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>
Diffstat (limited to 'fs')
| -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 5ea644b679ad..d390b8bbfdb9 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -5025,6 +5025,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; |