From: Jeff Layton Date: Fri, 15 Nov 2024 15:35:53 +0000 (-0500) Subject: fs: prepend statmount.mnt_opts string with security_sb_mnt_opts() X-Git-Tag: v6.12.14~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45439a8b1115522a071f227dda8bd52699dadfee;p=thirdparty%2Fkernel%2Fstable.git 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 Link: https://lore.kernel.org/r/20241115-statmount-v2-2-cd29aeff9cbb@kernel.org Signed-off-by: Christian Brauner Stable-dep-of: 5eb987105357 ("fs: fix adding security options to statmount.mnt_opt") Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/namespace.c b/fs/namespace.c index 5ea644b679add..d390b8bbfdb9b 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;