Commit ccc7b259 authored Jan 11, 2023 by Alan Stern Committed by openeuler-sync-bot Jan 17, 2023

USB: core: Fix RST error in hub.c

mainline inclusion
from mainline-v6.0-rc7
commit 766a96dc
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I675RE
CVE: CVE-2022-4662

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=766a96dc558385be735a370db867e302c8f22153



--------------------------------

A recent commit added an invalid RST expression to a kerneldoc comment
in hub.c.  The fix is trivial.

Fixes: 9c6d7788 ("USB: core: Prevent nested device-reset calls")
Cc: <stable@vger.kernel.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/YxDDcsLtRZ7c20pq@rowland.harvard.edu


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Yuyao Lin <linyuyao1@huawei.com>
Reviewed-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>
(cherry picked from commit 4735b18c)

parent 49cb8d4e

drivers/usb/core/hub.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5968,7 +5968,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
		*
		* Return: The same as for usb_reset_and_verify_device().
		* However, if a reset is already in progress (for instance, if a
		* driver doesn't have pre_ or post_reset() callbacks, and while
		* driver doesn't have pre_reset() or post_reset() callbacks, and while
		* being unbound or re-bound during the ongoing reset its disconnect()
		* or probe() routine tries to perform a second, nested reset), the
		* routine returns -EINPROGRESS.