Browse Source

ext4: fix potential use after free in __ext4_journal_stop

There is a use-after-free possibility in __ext4_journal_stop() in the
case that we free the handle in the first jbd2_journal_stop() because
we're referencing handle->h_err afterwards. This was introduced in
9705acd63b125dee8b15c705216d7186daea4625 and it is wrong. Fix it by
storing the handle->h_err value beforehand and avoid referencing
potentially freed handle.

Fixes: 9705acd63b125dee8b15c705216d7186daea4625
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Cc: stable@vger.kernel.org
Lukas Czerner 9 years ago
parent
commit
6934da9238
1 changed files with 3 additions and 3 deletions
  1. 3 3
      fs/ext4/ext4_jbd2.c

+ 3 - 3
fs/ext4/ext4_jbd2.c

@@ -88,13 +88,13 @@ int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle)
 		return 0;
 		return 0;
 	}
 	}
 
 
+	err = handle->h_err;
 	if (!handle->h_transaction) {
 	if (!handle->h_transaction) {
-		err = jbd2_journal_stop(handle);
-		return handle->h_err ? handle->h_err : err;
+		rc = jbd2_journal_stop(handle);
+		return err ? err : rc;
 	}
 	}
 
 
 	sb = handle->h_transaction->t_journal->j_private;
 	sb = handle->h_transaction->t_journal->j_private;
-	err = handle->h_err;
 	rc = jbd2_journal_stop(handle);
 	rc = jbd2_journal_stop(handle);
 
 
 	if (!err)
 	if (!err)