diff options
author | Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> | 2012-09-23 22:49:12 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2012-09-23 22:49:12 -0400 |
commit | 50df9fd55e4271e89a7adf3b1172083dd0ca199d (patch) | |
tree | f2b72f080a0963ee553385c9e2f2d77a5276e1f4 /fs/ext4/super.c | |
parent | bef53b01faeb791e27605cba1a71ba21364cb23e (diff) |
ext4: fix crash when accessing /proc/mounts concurrently
The crash was caused by a variable being erronously declared static in
token2str().
In addition to /proc/mounts, the problem can also be easily replicated
by accessing /proc/fs/ext4/<partition>/options in parallel:
$ cat /proc/fs/ext4/<partition>/options > options.txt
... and then running the following command in two different terminals:
$ while diff /proc/fs/ext4/<partition>/options options.txt; do true; done
This is also the cause of the following a crash while running xfstests
#234, as reported in the following bug reports:
https://bugs.launchpad.net/bugs/1053019
https://bugzilla.kernel.org/show_bug.cgi?id=47731
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Brad Figg <brad.figg@canonical.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index e6784b3276be..7bef0a4bc518 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1749,7 +1749,7 @@ static inline void ext4_show_quota_options(struct seq_file *seq, | |||
1749 | 1749 | ||
1750 | static const char *token2str(int token) | 1750 | static const char *token2str(int token) |
1751 | { | 1751 | { |
1752 | static const struct match_token *t; | 1752 | const struct match_token *t; |
1753 | 1753 | ||
1754 | for (t = tokens; t->token != Opt_err; t++) | 1754 | for (t = tokens; t->token != Opt_err; t++) |
1755 | if (t->token == token && !strchr(t->pattern, '=')) | 1755 | if (t->token == token && !strchr(t->pattern, '=')) |