| From | Greg Kroah-Hartman <> | Subject | [PATCH 4.6 091/100] md: md.c: fix oops in mddev_suspend for raid0 | Date | Mon, 30 May 2016 13:50:26 -0700 |
| |
4.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heinz Mauelshagen <heinzm@redhat.com>
commit 092398dce8c2406bfb0c9eebc3e764ff2ddb62a8 upstream.
Introduced by upstream commit 70d9798b95562abac005d4ba71d28820f9a201eb
The raid0 personality does not create mddev->thread as oposed to other personalities leading to its unconditional access in mddev_suspend() causing an oops.
Patch checks for mddev->thread in order to keep the intention of aforementioned commit.
Fixes: 70d9798b9556 ("MD: warn for potential deadlock") Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com> Signed-off-by: Shaohua Li <shli@fb.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- drivers/md/md.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -307,7 +307,7 @@ static blk_qc_t md_make_request(struct r */ void mddev_suspend(struct mddev *mddev) { - WARN_ON_ONCE(current == mddev->thread->tsk); + WARN_ON_ONCE(mddev->thread && current == mddev->thread->tsk); if (mddev->suspended++) return; synchronize_rcu();
|