All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bin Liu <b-liu@ti.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: <linux-usb@vger.kernel.org>, Bin Liu <b-liu@ti.com>
Subject: [PATCH 6/6] usb: musb: Fix runtime PM imbalance on error
Date: Sun, 24 May 2020 21:50:49 -0500	[thread overview]
Message-ID: <20200525025049.3400-7-b-liu@ti.com> (raw)
In-Reply-To: <20200525025049.3400-1-b-liu@ti.com>

From: Dinghao Liu <dinghao.liu@zju.edu.cn>

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>
---
 drivers/usb/musb/musb_debugfs.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index 7b6281ab62ed..30a89aa8a3e7 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -168,6 +168,11 @@ static ssize_t musb_test_mode_write(struct file *file,
 	u8			test;
 	char			buf[24];
 
+	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) {
@@ -176,11 +181,6 @@ static ssize_t musb_test_mode_write(struct file *file,
 		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 full-speed"))
 		test = MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_FS;
 
-- 
2.17.1


      parent reply	other threads:[~2020-05-25  2:50 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-25  2:50 [PATCH 0/6] musb patches for v5.8-rc1 Bin Liu
2020-05-25  2:50 ` [PATCH 1/6] usb: musb: return -ESHUTDOWN in urb when three-strikes error happened Bin Liu
2020-05-25  2:50 ` [PATCH 2/6] usb: musb: start session in resume for host port Bin Liu
2020-05-25  2:50 ` [PATCH 3/6] usb: musb: use true for 'use_dma' Bin Liu
2020-05-25  2:50 ` [PATCH 4/6] usb: musb: mediatek: add reset FADDR to zero in reset interrupt handle Bin Liu
2020-06-17  8:17   ` Macpaul Lin
2020-06-17  8:58     ` Greg Kroah-Hartman
2020-06-17  9:31       ` Macpaul Lin
2020-06-19  8:51         ` Greg Kroah-Hartman
2020-05-25  2:50 ` [PATCH 5/6] usb: musb: jz4740: Prevent lockup when CONFIG_SMP is set Bin Liu
2020-05-25  2:50 ` Bin Liu [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200525025049.3400-7-b-liu@ti.com \
    --to=b-liu@ti.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.