From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753488AbbIDLmd (ORCPT ); Fri, 4 Sep 2015 07:42:33 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:32971 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750976AbbIDLmc (ORCPT ); Fri, 4 Sep 2015 07:42:32 -0400 From: Sudip Mukherjee To: Thomas Dahlmann , Felipe Balbi , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-geode@lists.infradead.org, linux-usb@vger.kernel.org, Sudip Mukherjee Subject: [PATCH] usb: gadget: amd5536udc: fix NULL pointer dereference Date: Fri, 4 Sep 2015 17:12:23 +0530 Message-Id: <1441366943-9390-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We were checking if dev->regs is NULL but it was done after dereferencing it. Lets reset the controller and iounmap dev->regs only if it is not NULL. free_irq() does not need dev->regs, so unmaping it before freeing the irq should not matter. Signed-off-by: Sudip Mukherjee --- drivers/usb/gadget/udc/amd5536udc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/udc/amd5536udc.c b/drivers/usb/gadget/udc/amd5536udc.c index fdacddb..26066d3 100644 --- a/drivers/usb/gadget/udc/amd5536udc.c +++ b/drivers/usb/gadget/udc/amd5536udc.c @@ -3135,11 +3135,12 @@ static void udc_pci_remove(struct pci_dev *pdev) } /* reset controller */ - writel(AMD_BIT(UDC_DEVCFG_SOFTRESET), &dev->regs->cfg); + if (dev->regs) { + writel(AMD_BIT(UDC_DEVCFG_SOFTRESET), &dev->regs->cfg); + iounmap(dev->regs); + } if (dev->irq_registered) free_irq(pdev->irq, dev); - if (dev->regs) - iounmap(dev->regs); if (dev->mem_region) release_mem_region(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0)); -- 1.9.1