From: Greg Kroah-Hartman Date: Mon, 16 Apr 2012 19:25:48 +0000 (-0700) Subject: 3.2-stable patches X-Git-Tag: v3.2.16~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da33c0b71aaf5add4360dd4d1892398192f80eaf;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..9703577b6ea --- /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 +Date: Thu, 12 Apr 2012 16:05:06 +1000 +Subject: md/bitmap: prevent bitmap_daemon_work running while initialising bitmap + +From: NeilBrown + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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 bc6cc2001a1..d9ccef77b8a 100644 --- 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