5.4-stable patches

added patches:
	can-ucan-fix-non-atomic-allocation-in-completion-handler.patch

diff --git a/queue-5.4/can-ucan-fix-non-atomic-allocation-in-completion-handler.patch b/queue-5.4/can-ucan-fix-non-atomic-allocation-in-completion-handler.patch
new file mode 100644 (file)
index 0000000..f479994
--- /dev/null
+++ b/queue-5.4/can-ucan-fix-non-atomic-allocation-in-completion-handler.patch
@@ -0,0 +1,36 @@
+From 870db5d1015c8bd63e93b579e857223c96249ff7 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan@kernel.org>
+Date: Thu, 28 Nov 2019 19:26:03 +0100
+Subject: can: ucan: fix non-atomic allocation in completion handler
+
+From: Johan Hovold <johan@kernel.org>
+
+commit 870db5d1015c8bd63e93b579e857223c96249ff7 upstream.
+
+USB completion handlers are called in atomic context and must
+specifically not allocate memory using GFP_KERNEL.
+
+Fixes: 9f2d3eae88d2 ("can: ucan: add driver for Theobroma Systems UCAN devices")
+Cc: stable <stable@vger.kernel.org>     # 4.19
+Cc: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
+Cc: Martin Elshuber <martin.elshuber@theobroma-systems.com>
+Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/can/usb/ucan.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/can/usb/ucan.c
++++ b/drivers/net/can/usb/ucan.c
+@@ -792,7 +792,7 @@ resubmit:
+                         up);
+ 
+       usb_anchor_urb(urb, &up->rx_urbs);
+-      ret = usb_submit_urb(urb, GFP_KERNEL);
++      ret = usb_submit_urb(urb, GFP_ATOMIC);
+ 
+       if (ret < 0) {
+               netdev_err(up->netdev,

diff --git a/queue-5.4/series b/queue-5.4/series
index abaa559160a1516ea87f16b5fef01fdaddd84e17..6d73405e6326b0021e78bf44ec4c940d80845da5 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -78,3 +78,4 @@ spi-stm32-qspi-fix-kernel-oops-when-unbinding-driver.patch
 spi-atmel-fix-cs-high-support.patch
 spi-fix-spi_cs_high-setting-when-using-native-and-gpio-cs.patch
 spi-fix-null-pointer-when-setting-spi_cs_high-for-gpio-cs.patch
+can-ucan-fix-non-atomic-allocation-in-completion-handler.patch