From: Greg Kroah-Hartman Date: Mon, 8 Jun 2020 12:32:11 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.7.2~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01d2f28ed271cef0b5fdc3e53d99f0f89dd7568c;p=thirdparty%2Fkernel%2Fstable-queue.git 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 0bcb50c8a95..fd8592f17d6 100644 --- 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 index 00000000000..9a3523e4402 --- /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 +Date: Sun, 24 May 2020 21:50:49 -0500 +Subject: usb: musb: Fix runtime PM imbalance on error + +From: Dinghao Liu + +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 +Cc: stable@vger.kernel.org +Signed-off-by: Bin Liu +Link: https://lore.kernel.org/r/20200525025049.3400-7-b-liu@ti.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Greg Kroah-Hartman + +--- + 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; +