Skip to content

Commit 26c5d78

Browse files
ebiggerstorvalds
authored andcommitted
fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()
After request_module(), nothing is stopping the module from being unloaded until someone takes a reference to it via try_get_module(). The WARN_ONCE() in get_fs_type() is thus user-reachable, via userspace running 'rmmod' concurrently. Since WARN_ONCE() is for kernel bugs only, not for user-reachable situations, downgrade this warning to pr_warn_once(). Keep it printed once only, since the intent of this warning is to detect a bug in modprobe at boot time. Printing the warning more than once wouldn't really provide any useful extra information. Fixes: 41124db ("fs: warn in case userspace lied about modprobe return") Signed-off-by: Eric Biggers <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Reviewed-by: Jessica Yu <[email protected]> Cc: Alexei Starovoitov <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Jeff Vander Stoep <[email protected]> Cc: Jessica Yu <[email protected]> Cc: Kees Cook <[email protected]> Cc: Luis Chamberlain <[email protected]> Cc: NeilBrown <[email protected]> Cc: <[email protected]> [4.13+] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent d7d27cf commit 26c5d78

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

fs/filesystems.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ struct file_system_type *get_fs_type(const char *name)
272272
fs = __get_fs_type(name, len);
273273
if (!fs && (request_module("fs-%.*s", len, name) == 0)) {
274274
fs = __get_fs_type(name, len);
275-
WARN_ONCE(!fs, "request_module fs-%.*s succeeded, but still no fs?\n", len, name);
275+
if (!fs)
276+
pr_warn_once("request_module fs-%.*s succeeded, but still no fs?\n",
277+
len, name);
276278
}
277279

278280
if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {

0 commit comments

Comments
 (0)