From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755935AbdJJCou (ORCPT ); Mon, 9 Oct 2017 22:44:50 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33032 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754287AbdJJCos (ORCPT ); Mon, 9 Oct 2017 22:44:48 -0400 X-Google-Smtp-Source: AOwi7QBkpU71XZXXl3QY3fCZZDzAsfJCqLvd8aWCLa/twDn4HJs2MKJx/P7484vZC7iBwR+JJnTK3w== From: Jonathan Liu To: Bin Liu , Greg Kroah-Hartman , Maxime Ripard , Chen-Yu Tsai Cc: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, Jonathan Liu Subject: [PATCH v2] usb: musb: sunxi: Explicitly release USB PHY on exit Date: Tue, 10 Oct 2017 13:45:25 +1100 Message-Id: <20171010024525.21971-1-net147@gmail.com> X-Mailer: git-send-email 2.14.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This fixes a kernel oops when unloading the driver due to usb_put_phy being called after usb_phy_generic_unregister when the device is detached. Calling usb_phy_generic_unregister causes x->dev->driver to be NULL in usb_put_phy and results in a NULL pointer dereference. Cc: stable@vger.kernel.org # v4.3+ Signed-off-by: Jonathan Liu --- Changes for v2: - Use devm_usb_put_phy instead of usb_put_phy drivers/usb/musb/sunxi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c index c9a09b5bb6e5..dc353e24d53c 100644 --- a/drivers/usb/musb/sunxi.c +++ b/drivers/usb/musb/sunxi.c @@ -297,6 +297,8 @@ static int sunxi_musb_exit(struct musb *musb) if (test_bit(SUNXI_MUSB_FL_HAS_SRAM, &glue->flags)) sunxi_sram_release(musb->controller->parent); + devm_usb_put_phy(glue->dev, glue->xceiv); + return 0; } -- 2.14.2