releases/2.6.27.46/ext4-avoid-null-pointer-dereference-when-decoding-erofs-w-o-a-journal.patch

   1 From 78f1ddbb498283c2445c11b0dfa666424c301803 Mon Sep 17 00:00:00 2001
   2 From: Theodore Ts'o <tytso@mit.edu>
   3 Date: Mon, 27 Jul 2009 23:09:47 -0400
   4 Subject: ext4: Avoid null pointer dereference when decoding EROFS w/o a journal
   5
   6 From: Theodore Ts'o <tytso@mit.edu>
   7
   8 commit 78f1ddbb498283c2445c11b0dfa666424c301803 upstream.
   9
  10 We need to check to make sure a journal is present before checking the
  11 journal flags in ext4_decode_error().
  12
  13 Signed-off-by: Eric Sesterhenn <eric.sesterhenn@lsexperts.de>
  14 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16
  17 ---
  18  fs/ext4/super.c |    3 ++-
  19  1 file changed, 2 insertions(+), 1 deletion(-)
  20
  21 --- a/fs/ext4/super.c
  22 +++ b/fs/ext4/super.c
  23 @@ -254,7 +254,8 @@ static const char *ext4_decode_error(str
  24                 errstr = "Out of memory";
  25                 break;
  26         case -EROFS:
  27 -               if (!sb || EXT4_SB(sb)->s_journal->j_flags & JBD2_ABORT)
  28 +               if (!sb || (EXT4_SB(sb)->s_journal &&
  29 +                           EXT4_SB(sb)->s_journal->j_flags & JBD2_ABORT))
  30                         errstr = "Journal has aborted";
  31                 else
  32                         errstr = "Readonly filesystem";