| From e8abf4864c0fbf86141cb72e4eb2acce4bd4b7fa Mon Sep 17 00:00:00 2001 |
| From: Theodore Ts'o <tytso@mit.edu> |
| Date: Mon, 27 Jul 2009 23:09:47 -0400 |
| Subject: [PATCH 02/85] ext4: Avoid null pointer dereference when decoding EROFS w/o a journal |
| |
| (cherry picked from commit 78f1ddbb498283c2445c11b0dfa666424c301803) |
| |
| We need to check to make sure a journal is present before checking the |
| journal flags in ext4_decode_error(). |
| |
| Signed-off-by: Eric Sesterhenn <eric.sesterhenn@lsexperts.de> |
| Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| fs/ext4/super.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/fs/ext4/super.c |
| +++ b/fs/ext4/super.c |
| @@ -344,7 +344,8 @@ static const char *ext4_decode_error(str |
| errstr = "Out of memory"; |
| break; |
| case -EROFS: |
| - if (!sb || EXT4_SB(sb)->s_journal->j_flags & JBD2_ABORT) |
| + if (!sb || (EXT4_SB(sb)->s_journal && |
| + EXT4_SB(sb)->s_journal->j_flags & JBD2_ABORT)) |
| errstr = "Journal has aborted"; |
| else |
| errstr = "Readonly filesystem"; |
