Update to 2.6.36.1 and fix one more panic

2 files changed, 38 insertions, 2 deletions

diff --git a/PATCHCFG b/PATCHCFG
index 399359a..2c95d6b 100644
--- a/PATCHCFG
+++ b/PATCHCFG
@@ -10,18 +10,22 @@ SRCNAME="linux-2.6.36-ARCH"
 #   filename%patchlevel (file must be in patches/ subdirectory)
 PATCHES=(
          # add upstream patch from 2.6.36 series
-         #ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.36.1.bz2%1
+         ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.36.1.bz2%1
 
          # add latest fixes from stable queue, if needed
          # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
+         # Apply http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a1c6c5698d53db4c47a25c3a8d11731a4d7b8370
+         # to our kernel to fix a ext4 related panic
+         ext4-fix-NULL-pointer-dereference-in-print_daily_err.patch%1
+
          # add aufs2 support, in reference to:
          # http://aufs.sourceforge.net
          aufs2-base-20101021.patch%1
          aufs2-standalone-20101021.patch%1
         )
 # Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-2.6.36-1-ARCH"
+PATCHNAME="patch-2.6.36.1-1-ARCH"
 
 # Run this before applying patches
 pre_apply() {
diff --git a/patches/ext4-fix-NULL-pointer-dereference-in-print_daily_err.patch b/patches/ext4-fix-NULL-pointer-dereference-in-print_daily_err.patch
new file mode 100644
index 0000000..c715b27
--- /dev/null
+++ b/patches/ext4-fix-NULL-pointer-dereference-in-print_daily_err.patch
@@ -0,0 +1,32 @@
+From a1c6c5698d53db4c47a25c3a8d11731a4d7b8370 Mon Sep 17 00:00:00 2001
+From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
+Date: Wed, 27 Oct 2010 21:30:04 -0400
+Subject: [PATCH] ext4: fix NULL pointer dereference in print_daily_error_info()
+
+Fix NULL pointer dereference in print_daily_error_info, when
+called on unmounted fs (EXT4_SB(sb) returns NULL), by removing error
+reporting timer in ext4_put_super.
+
+Google-Bug-Id: 3017663
+
+Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
+Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
+---
+ fs/ext4/super.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 2614774..751997d 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -719,6 +719,7 @@ static void ext4_put_super(struct super_block *sb)
+ 			ext4_abort(sb, "Couldn't clean up the journal");
+ 	}
+ 
++	del_timer(&sbi->s_err_report);
+ 	ext4_release_system_zone(sb);
+ 	ext4_mb_release(sb);
+ 	ext4_ext_release(sb);
+-- 
+1.7.3.2
+