Received: by 10.223.185.116 with SMTP id b49csp4176319wrg; Mon, 26 Feb 2018 12:35:47 -0800 (PST) X-Google-Smtp-Source: AH8x227cqIXSOlGiMnupiz6DBsQvENq9kNAKqJE5J1+/WN4Cb/k3K84DN1XRmmKWEfHIPchSArRx X-Received: by 10.99.111.78 with SMTP id k75mr9420011pgc.414.1519677347356; Mon, 26 Feb 2018 12:35:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677347; cv=none; d=google.com; s=arc-20160816; b=zbAlBEDrq+t2PmtbQkCzUwGwK2lxOme+2GIVz/Pf70ouMbdCPDb9NqIKLMF8xSM8UD 4pWL9wPiPhSU9qM4qe9ZsEZRP4/ASO9LZ8XQ4zkUK2Eda9Q+KXvPXvQOUK8V8oDandFw m7Qc0W8FzwCze5LZbsJfDz+COwQtKUCtM2MN9ZQcNKvdftVE8jHMDObyAqH0D17dL3d1 Vb/VBCfVK2rhP8Dlx+5iEaAVV31hzRhvJ0W+xhKOiUrauOQHXz+tSc39Xiujiv2el03U xNdGY4RmsV1nU5+V9kcQvwuZUoZk/1wKkVENOFd0IkY1Ogrs9cg7IJD+Il4dfq4lYITa RX6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Bnbz0IGNpt9jPtiwqkQKT4bbYGG96HCvfdzDOmQK/II=; b=xOJ2sW/fi8Q/j466Q6W2tV9XDW9PAZnv9Cc+jTEnLhkiOEVO7ro3igggu89HN5X8MG wCX+jTIFK5+FJnwZUVulkj7r4ak0Sl4/hm/l6CPcMcJ1bmAo6Gy/2ENZlco7b59KA34X TaMzx7CNcRgiDO/6VX5Z8qqEpbiwoxMlrqENcMF7E4MUbdoNPyzeuIksglWF5RuSihgB D/1MMslnix1otG1KRJ1z2gcSe+mhCvVFhanSq3z+OLaqNfh/9SMUyvo2WIMTxbcyBkVe h/Z+B5WWj6LXB6uVehlINRlb42QCz3HaBrJ8h0wbi5j/v2PP/ClvLReBnKxmUbqgXoiG l5Dw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p9-v6si6943368pls.787.2018.02.26.12.35.31; Mon, 26 Feb 2018 12:35:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753747AbeBZUeI (ORCPT + 99 others); Mon, 26 Feb 2018 15:34:08 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37018 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753857AbeBZU2F (ORCPT ); Mon, 26 Feb 2018 15:28:05 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 40A73CC3; Mon, 26 Feb 2018 20:28:04 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Li Jun , Peter Chen , Fabio Estevam , Felipe Balbi Subject: [PATCH 4.15 47/64] usb: phy: mxs: Fix NULL pointer dereference on i.MX23/28 Date: Mon, 26 Feb 2018 21:22:24 +0100 Message-Id: <20180226202155.466230975@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fabio Estevam commit 499350865387f8b8c40a9e9453a9a7eb3cec5dc4 upstream. Commit e93650994a95 ("usb: phy: mxs: add usb charger type detection") causes the following kernel hang on i.MX28: [ 2.207973] usbcore: registered new interface driver usb-storage [ 2.235659] Unable to handle kernel NULL pointer dereference at virtual address 00000188 [ 2.244195] pgd = (ptrval) [ 2.246994] [00000188] *pgd=00000000 [ 2.250676] Internal error: Oops: 5 [#1] ARM [ 2.254979] Modules linked in: [ 2.258089] CPU: 0 PID: 1 Comm: swapper Not tainted 4.15.0-rc8-next-20180117-00002-g75d5f21 #7 [ 2.266724] Hardware name: Freescale MXS (Device Tree) [ 2.271921] PC is at regmap_read+0x0/0x5c [ 2.275977] LR is at mxs_phy_charger_detect+0x34/0x1dc mxs_phy_charger_detect() makes accesses to the anatop registers via regmap, however i.MX23/28 do not have such registers, which causes a NULL pointer dereference. Fix the issue by doing a NULL check on the 'regmap' pointer. Fixes: e93650994a95 ("usb: phy: mxs: add usb charger type detection") Cc: # v4.15 Reviewed-by: Li Jun Acked-by: Peter Chen Signed-off-by: Fabio Estevam Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/phy/phy-mxs-usb.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/usb/phy/phy-mxs-usb.c +++ b/drivers/usb/phy/phy-mxs-usb.c @@ -602,6 +602,9 @@ static enum usb_charger_type mxs_phy_cha void __iomem *base = phy->io_priv; enum usb_charger_type chgr_type = UNKNOWN_TYPE; + if (!regmap) + return UNKNOWN_TYPE; + if (mxs_charger_data_contact_detect(mxs_phy)) return chgr_type;