summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2010-11-22 21:51:51 +0100
committerThomas Bächler <thomas@archlinux.org>2010-11-22 21:51:51 +0100
commitfe8521995cac38f3a2b10101f444de447aa7020a (patch)
tree0b8e2bda501ff762d515719b360dd210789fea70 /patches
parente368a1447942825ad569bcbf5e4a2b98094636f4 (diff)
Update to 2.6.36.1 and fix one more panic
Diffstat (limited to 'patches')
-rw-r--r--patches/ext4-fix-NULL-pointer-dereference-in-print_daily_err.patch32
1 files changed, 32 insertions, 0 deletions
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
+