reiserfs: Fix locking BUG during mount failure
PATCH 1/1 reiserfs: Fix locking BUG during mount failure
Commit 8ebc423238341b52912c7295b045a32477b33f09 (reiserfs: kill-the-BKL) introduced a bug in the mount failure case.
The error label releases the lock before calling journal_release_error, but it requires that the lock be held. do_journal_release unlocks and retakes it. When it releases it without it held, we trigger a BUG().
The error_alloc label skips the unlock since the lock isn't held yet but none of the other conditions that are clean up exist yet either.
This patch returns immediately after the kzalloc failure and moves the reiserfs_write_unlock after the journal_release_error call.
This was reported in https://bugzilla.novell.com/show_bug.cgi?id=591807
--- fs/reiserfs/super.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/reiserfs/super.c +4 -6
@@ -1618,10 +1618,8 @@ static int reiserfs_fill_super(struct susave_mount_options (s, data); sbi =kzalloc (sizeof (struct reiserfs_sb_info ),GFP_KERNEL ); -if (!sbi) { - errval = -ENOMEM ; - goto error_alloc; - } +if (!sbi) +return -ENOMEM ; s->s_fs_info = sbi;/* Set default values for options: non-aggressive tails, RO on errors */ REISERFS_SB (s)->s_mount_opt |= (1 <<REISERFS_SMALLTAIL );
@@ -1881,12 +1879,12 @@ static int reiserfs_fill_super(struct sureturn (0 ); error: -reiserfs_write_unlock (s); -error_alloc:if (jinit_done) {/* kill the commit thread, free journal ram */ journal_release_error (NULL , s); } +reiserfs_write_unlock (s); +reiserfs_free_bitmap_cache (s);if (SB_BUFFER_WITH_SB (s))brelse (SB_BUFFER_WITH_SB (s));
Frederic Weisbecker
AppliedQuoted 10 lines · Jeff Mahoney
Commit
8ebc423238341b52912c7295b045a32477b33f09(reiserfs: kill-the-BKL) introduced a bug in the mount failure case.The error label releases the lock before calling
journal_release_error, but it requires that the lock be held.do_journal_releaseunlocks and retakes it. When it releases it without it held, we trigger aBUG().The
error_alloclabel skips the unlock since the lock isn't held yet but none of the other conditions that are clean up exist yet either.
Quoted 8 lines
This patch returns immediately after the kzalloc failure and moves the
reiserfs_write_unlockafter thejournal_release_errorcall.This was reported in https://bugzilla.novell.com/show_bug.cgi?id=591807
Reported-by Thomas Siedentopf <[email protected]>Signed-off-by Jeff Mahoney <[email protected]>Cc Frederic Weisbecker <[email protected]>
I've applied it. Thanks a lot!
Quoted 34 lines
--- fs/reiserfs/super.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)fs/reiserfs/super.c +4
-6@@ -1618,10 +1618,8 @@ static int reiserfs_fill_super(struct susave_mount_options (s, data); sbi =kzalloc (sizeof (struct reiserfs_sb_info ),GFP_KERNEL ); -if (!sbi) { - errval = -ENOMEM ; - goto error_alloc; - } +if (!sbi) +return -ENOMEM ; s->s_fs_info = sbi;/* Set default values for options: non-aggressive tails, RO on errors */ REISERFS_SB (s)->s_mount_opt |= (1 <<REISERFS_SMALLTAIL );@@ -1881,12 +1879,12 @@ static int reiserfs_fill_super(struct sureturn (0 ); error: -reiserfs_write_unlock (s); -error_alloc:if (jinit_done) {/* kill the commit thread, free journal ram */ journal_release_error (NULL , s); } +reiserfs_write_unlock (s); +reiserfs_free_bitmap_cache (s);if (SB_BUFFER_WITH_SB (s))brelse (SB_BUFFER_WITH_SB (s));