From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 21 Mar 2019 10:23:29 +0000 (+0100)
Subject: 3.18-stable patches
X-Git-Tag: v3.18.137~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c38aeea62de2f31af1310988d61f1415da5ec01;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	md-fix-failed-allocation-of-md_register_thread.patch
---

diff --git a/queue-3.18/md-fix-failed-allocation-of-md_register_thread.patch b/queue-3.18/md-fix-failed-allocation-of-md_register_thread.patch
new file mode 100644
index 00000000000..39ab0ab5963
--- /dev/null
+++ b/queue-3.18/md-fix-failed-allocation-of-md_register_thread.patch
@@ -0,0 +1,49 @@
+From e406f12dde1a8375d77ea02d91f313fb1a9c6aec Mon Sep 17 00:00:00 2001
+From: Aditya Pakki <pakki001@umn.edu>
+Date: Mon, 4 Mar 2019 16:48:54 -0600
+Subject: md: Fix failed allocation of md_register_thread
+
+From: Aditya Pakki <pakki001@umn.edu>
+
+commit e406f12dde1a8375d77ea02d91f313fb1a9c6aec upstream.
+
+mddev->sync_thread can be set to NULL on kzalloc failure downstream.
+The patch checks for such a scenario and frees allocated resources.
+
+Committer node:
+
+Added similar fix to raid5.c, as suggested by Guoqing.
+
+Cc: stable@vger.kernel.org # v3.16+
+Acked-by: Guoqing Jiang <gqjiang@suse.com>
+Signed-off-by: Aditya Pakki <pakki001@umn.edu>
+Signed-off-by: Song Liu <songliubraving@fb.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/md/raid10.c |    2 ++
+ drivers/md/raid5.c  |    2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/md/raid10.c
++++ b/drivers/md/raid10.c
+@@ -3836,6 +3836,8 @@ static int run(struct mddev *mddev)
+ 		set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
+ 		mddev->sync_thread = md_register_thread(md_do_sync, mddev,
+ 							"reshape");
++		if (!mddev->sync_thread)
++			goto out_free_conf;
+ 	}
+ 
+ 	return 0;
+--- a/drivers/md/raid5.c
++++ b/drivers/md/raid5.c
+@@ -6171,6 +6171,8 @@ static int run(struct mddev *mddev)
+ 		set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
+ 		mddev->sync_thread = md_register_thread(md_do_sync, mddev,
+ 							"reshape");
++		if (!mddev->sync_thread)
++			goto abort;
+ 	}
+ 
+ 	/* Ok, everything is just fine now */
diff --git a/queue-3.18/series b/queue-3.18/series
index 115f0846513..24c1a9def6d 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -130,3 +130,4 @@ powerpc-83xx-also-save-restore-sprg4-7-during-suspend.patch
 arm-s3c24xx-fix-boolean-expressions-in-osiris_dvs_notify.patch
 nfsd-fix-memory-corruption-caused-by-readdir.patch
 nfsd-fix-wrong-check-in-write_v4_end_grace.patch
+md-fix-failed-allocation-of-md_register_thread.patch