4.9-stable patches

added patches:
	usb-musb-fix-runtime-pm-imbalance-on-error.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index 0bcb50c8a9516d85e950d9b108b0ccf7c60578da..fd8592f17d646803c246f388197e1359f2938598 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -28,3 +28,4 @@ l2tp-add-sk_family-checks-to-l2tp_validate_socket.patch
 usb-serial-qcserial-add-dw5816e-qdl-support.patch
 usb-serial-usb_wwan-do-not-resubmit-rx-urb-on-fatal-errors.patch
 usb-serial-option-add-telit-le910c1-eux-compositions.patch
+usb-musb-fix-runtime-pm-imbalance-on-error.patch

diff --git a/queue-4.9/usb-musb-fix-runtime-pm-imbalance-on-error.patch b/queue-4.9/usb-musb-fix-runtime-pm-imbalance-on-error.patch
new file mode 100644 (file)
index 0000000..9a3523e
--- /dev/null
+++ b/queue-4.9/usb-musb-fix-runtime-pm-imbalance-on-error.patch
@@ -0,0 +1,54 @@
+From e4befc121df03dc8ed2ac1031c98f9538e244bae Mon Sep 17 00:00:00 2001
+From: Dinghao Liu <dinghao.liu@zju.edu.cn>
+Date: Sun, 24 May 2020 21:50:49 -0500
+Subject: usb: musb: Fix runtime PM imbalance on error
+
+From: Dinghao Liu <dinghao.liu@zju.edu.cn>
+
+commit e4befc121df03dc8ed2ac1031c98f9538e244bae upstream.
+
+When copy_from_user() returns an error code, there
+is a runtime PM usage counter imbalance.
+
+Fix this by moving copy_from_user() to the beginning
+of this function.
+
+Fixes: 7b6c1b4c0e1e ("usb: musb: fix runtime PM in debugfs")
+
+Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
+Cc: stable@vger.kernel.org
+Signed-off-by: Bin Liu <b-liu@ti.com>
+Link: https://lore.kernel.org/r/20200525025049.3400-7-b-liu@ti.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/musb/musb_debugfs.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/drivers/usb/musb/musb_debugfs.c
++++ b/drivers/usb/musb/musb_debugfs.c
+@@ -200,6 +200,11 @@ static ssize_t musb_test_mode_write(stru
+       u8                      test;
+       char                    buf[18];
+ 
++      memset(buf, 0x00, sizeof(buf));
++
++      if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
++              return -EFAULT;
++
+       pm_runtime_get_sync(musb->controller);
+       test = musb_readb(musb->mregs, MUSB_TESTMODE);
+       if (test) {
+@@ -208,11 +213,6 @@ static ssize_t musb_test_mode_write(stru
+               goto ret;
+       }
+ 
+-      memset(buf, 0x00, sizeof(buf));
+-
+-      if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+-              return -EFAULT;
+-
+       if (strstarts(buf, "force host"))
+               test = MUSB_TEST_FORCE_HOST;
+