From: Greg Kroah-Hartman Date: Thu, 23 May 2019 12:35:05 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.1.5~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c75a9eaba745c6cef6818b7c8520c2a8671762d6;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: dm-delay-fix-a-crash-when-invalid-device-is-specified.patch --- diff --git a/queue-4.9/dm-delay-fix-a-crash-when-invalid-device-is-specified.patch b/queue-4.9/dm-delay-fix-a-crash-when-invalid-device-is-specified.patch new file mode 100644 index 00000000000..8d94d140013 --- /dev/null +++ b/queue-4.9/dm-delay-fix-a-crash-when-invalid-device-is-specified.patch @@ -0,0 +1,34 @@ +From 81bc6d150ace6250503b825d9d0c10f7bbd24095 Mon Sep 17 00:00:00 2001 +From: Mikulas Patocka +Date: Thu, 25 Apr 2019 12:07:54 -0400 +Subject: dm delay: fix a crash when invalid device is specified + +From: Mikulas Patocka + +commit 81bc6d150ace6250503b825d9d0c10f7bbd24095 upstream. + +When the target line contains an invalid device, delay_ctr() will call +delay_dtr() with NULL workqueue. Attempting to destroy the NULL +workqueue causes a crash. + +Signed-off-by: Mikulas Patocka +Cc: stable@vger.kernel.org +Signed-off-by: Mike Snitzer +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/md/dm-delay.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/md/dm-delay.c ++++ b/drivers/md/dm-delay.c +@@ -222,7 +222,8 @@ static void delay_dtr(struct dm_target * + { + struct delay_c *dc = ti->private; + +- destroy_workqueue(dc->kdelayd_wq); ++ if (dc->kdelayd_wq) ++ destroy_workqueue(dc->kdelayd_wq); + + dm_put_device(ti, dc->dev_read); + diff --git a/queue-4.9/series b/queue-4.9/series index 1c427143146..1c11c28b30a 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -38,3 +38,4 @@ fbdev-sm712fb-fix-crashes-and-garbled-display-during-dpms-modesetting.patch pci-mark-atheros-ar9462-to-avoid-bus-reset.patch pci-factor-out-pcie_retrain_link-function.patch pci-work-around-pericom-pcie-to-pci-bridge-retrain-link-erratum.patch +dm-delay-fix-a-crash-when-invalid-device-is-specified.patch