OSDN Git Service

USB: hub: fix up early-exit pathway in hub_activate
authorAlan Stern <stern@rowland.harvard.edu>
Fri, 5 Aug 2016 15:49:45 +0000 (11:49 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Aug 2016 13:45:59 +0000 (15:45 +0200)
commitca5cbc8b02f9b21cc8cd1ab36668763ec34f9ee8
tree0976c55e7e133a4f70eca694e3e86eb493745f10
parent6bb47e8ab98accb1319bd43c64966340ba3bba9a
USB: hub: fix up early-exit pathway in hub_activate

The early-exit pathway in hub_activate, added by commit e50293ef9775
("USB: fix invalid memory access in hub_activate()") needs
improvement.  It duplicates code that is already present at the end of
the subroutine, and it neglects to undo the effect of a
usb_autopm_get_interface_no_resume() call.

This patch fixes both problems by making the early-exit pathway jump
directly to the end of the subroutine.  It simplifies the code at the
end by merging two conditionals that actually test the same condition
although they appear different: If type < HUB_INIT3 then type must be
either HUB_INIT2 or HUB_INIT, and it can't be HUB_INIT because in that
case the subroutine would have exited earlier.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: <stable@vger.kernel.org> #4.4+
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/hub.c