* [PATCH] [v3] usb: musb: Fix runtime PM imbalance on error
@ 2020-05-22 5:42 Dinghao Liu
2020-05-22 15:37 ` Bin Liu
0 siblings, 1 reply; 2+ messages in thread
From: Dinghao Liu @ 2020-05-22 5:42 UTC (permalink / raw)
To: dinghao.liu, kjlu; +Cc: Bin Liu, Greg Kroah-Hartman, linux-usb, linux-kernel
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.
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
Changelog:
v2: - Move copy_from_user() to the beginning rather
than adding pm_runtime_put_autosuspend().
v3: - Add missing changelog information.
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [v3] usb: musb: Fix runtime PM imbalance on error
2020-05-22 5:42 [PATCH] [v3] usb: musb: Fix runtime PM imbalance on error Dinghao Liu
@ 2020-05-22 15:37 ` Bin Liu
0 siblings, 0 replies; 2+ messages in thread
From: Bin Liu @ 2020-05-22 15:37 UTC (permalink / raw)
To: Dinghao Liu; +Cc: kjlu, Greg Kroah-Hartman, linux-usb, linux-kernel
On Fri, May 22, 2020 at 01:42:35PM +0800, Dinghao Liu wrote:
> 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.
>
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
>
> Changelog:
>
> v2: - Move copy_from_user() to the beginning rather
> than adding pm_runtime_put_autosuspend().
>
> v3: - Add missing changelog information.
Queued for v5.8. Thanks.
-Bin.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-22 15:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 5:42 [PATCH] [v3] usb: musb: Fix runtime PM imbalance on error Dinghao Liu
2020-05-22 15:37 ` Bin Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).