From: Greg Kroah-Hartman Date: Thu, 16 Nov 2017 16:50:29 +0000 (+0100) Subject: 4.13-stable patches X-Git-Tag: v3.18.82~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b97978a45379466f77345d2eb07384e7648023a;p=thirdparty%2Fkernel%2Fstable-queue.git 4.13-stable patches added patches: dmaengine-dmatest-warn-user-when-dma-test-times-out.patch --- diff --git a/queue-4.13/dmaengine-dmatest-warn-user-when-dma-test-times-out.patch b/queue-4.13/dmaengine-dmatest-warn-user-when-dma-test-times-out.patch new file mode 100644 index 00000000000..b4aef4a83ec --- /dev/null +++ b/queue-4.13/dmaengine-dmatest-warn-user-when-dma-test-times-out.patch @@ -0,0 +1,37 @@ +From a9df21e34b422f79d9a9fa5c3eff8c2a53491be6 Mon Sep 17 00:00:00 2001 +From: Adam Wallis +Date: Thu, 2 Nov 2017 08:53:30 -0400 +Subject: dmaengine: dmatest: warn user when dma test times out + +From: Adam Wallis + +commit a9df21e34b422f79d9a9fa5c3eff8c2a53491be6 upstream. + +Commit adfa543e7314 ("dmatest: don't use set_freezable_with_signal()") +introduced a bug (that is in fact documented by the patch commit text) +that leaves behind a dangling pointer. Since the done_wait structure is +allocated on the stack, future invocations to the DMATEST can produce +undesirable results (e.g., corrupted spinlocks). Ideally, this would be +cleaned up in the thread handler, but at the very least, the kernel +is left in a very precarious scenario that can lead to some long debug +sessions when the crash comes later. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197605 +Signed-off-by: Adam Wallis +Signed-off-by: Vinod Koul +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/dma/dmatest.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/dma/dmatest.c ++++ b/drivers/dma/dmatest.c +@@ -696,6 +696,7 @@ static int dmatest_func(void *data) + * free it this time?" dancing. For now, just + * leave it dangling. + */ ++ WARN(1, "dmatest: Kernel stack may be corrupted!!\n"); + dmaengine_unmap_put(um); + result("test timed out", total_tests, src_off, dst_off, + len, 0); diff --git a/queue-4.13/series b/queue-4.13/series index ab4200fa878..e56b1d8983d 100644 --- a/queue-4.13/series +++ b/queue-4.13/series @@ -41,3 +41,4 @@ mac80211-don-t-compare-tkip-tx-mic-key-in-reinstall-prevention.patch usb-usbtest-fix-null-pointer-dereference.patch input-ims-psu-check-if-cdc-union-descriptor-is-sane.patch edac-sb_edac-don-t-create-a-second-memory-controller-if-ha1-is-not-present.patch +dmaengine-dmatest-warn-user-when-dma-test-times-out.patch