3.2-stable patches

added patches:
	md-bitmap-prevent-bitmap_daemon_work-running-while-initialising-bitmap.patch

diff --git a/queue-3.2/md-bitmap-prevent-bitmap_daemon_work-running-while-initialising-bitmap.patch b/queue-3.2/md-bitmap-prevent-bitmap_daemon_work-running-while-initialising-bitmap.patch
new file mode 100644 (file)
index 0000000..9703577
--- /dev/null
+++ b/queue-3.2/md-bitmap-prevent-bitmap_daemon_work-running-while-initialising-bitmap.patch
@@ -0,0 +1,39 @@
+From afbaa90b80b1ec66e5137cc3824746bfdf559b18 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Thu, 12 Apr 2012 16:05:06 +1000
+Subject: md/bitmap: prevent bitmap_daemon_work running while initialising bitmap
+
+From: NeilBrown <neilb@suse.de>
+
+commit afbaa90b80b1ec66e5137cc3824746bfdf559b18 upstream.
+
+If a bitmap is added while the array is active, it is possible
+for bitmap_daemon_work to run while the bitmap is being
+initialised.
+This is particularly a problem if bitmap_daemon_work sees
+bitmap->filemap as non-NULL before it has been filled in properly.
+So hold bitmap_info.mutex while filling in ->filemap
+to prevent problems.
+
+This patch is suitable for any -stable kernel, though it might not
+apply cleanly before about 3.1.
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/md/bitmap.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/md/bitmap.c
++++ b/drivers/md/bitmap.c
+@@ -1819,7 +1819,9 @@ int bitmap_load(struct mddev *mddev)
+                * re-add of a missing device */
+               start = mddev->recovery_cp;
+ 
++      mutex_lock(&mddev->bitmap_info.mutex);
+       err = bitmap_init_from_disk(bitmap, start);
++      mutex_unlock(&mddev->bitmap_info.mutex);
+ 
+       if (err)
+               goto out;

diff --git a/queue-3.2/series b/queue-3.2/series
index bc6cc2001a18280df0d3449843e5d63c44f46650..d9ccef77b8aa0632dc10b35028264c3e7c4557ca 100644 (file)
--- a/queue-3.2/series
+++ b/queue-3.2/series
@@ -7,3 +7,4 @@ drm-i915-make-rc6-module-parameter-read-only.patch
 rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch
 arm-7379-1-dt-fix-atags_to_fdt-second-call-site.patch
 arm-7384-1-thumbee-disable-userspace-teehbr-access-for-config_arm_thumbee.patch
+md-bitmap-prevent-bitmap_daemon_work-running-while-initialising-bitmap.patch