summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorHerton Ronaldo Krzesinski <herton.krzesinski@canonical.com>2012-09-23 22:49:12 -0400
committerTheodore Ts'o <tytso@mit.edu>2012-09-23 22:49:12 -0400
commit50df9fd55e4271e89a7adf3b1172083dd0ca199d (patch)
treef2b72f080a0963ee553385c9e2f2d77a5276e1f4 /fs
parentbef53b01faeb791e27605cba1a71ba21364cb23e (diff)
downloadop-kernel-dev-50df9fd55e4271e89a7adf3b1172083dd0ca199d.zip
op-kernel-dev-50df9fd55e4271e89a7adf3b1172083dd0ca199d.tar.gz
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')
-rw-r--r--fs/ext4/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index e6784b3..7bef0a4 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,
static const char *token2str(int token)
{
- static const struct match_token *t;
+ const struct match_token *t;
for (t = tokens; t->token != Opt_err; t++)
if (t->token == token && !strchr(t->pattern, '='))
OpenPOWER on IntegriCloud