Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1587912ybv; Thu, 20 Feb 2020 23:49:25 -0800 (PST) X-Google-Smtp-Source: APXvYqwawJ+OyGIfUEm11/Y/6flfuNenHXeVp26xpSHP09yXcg7e8VJ6LIzRnTPyZG838amnYB/z X-Received: by 2002:aca:b483:: with SMTP id d125mr923595oif.167.1582271364952; Thu, 20 Feb 2020 23:49:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582271364; cv=none; d=google.com; s=arc-20160816; b=YHMThqXqghvbVQ8C8dXbGbO3/0vsx08sF6V0llb1OUqtB3qN1Sq/Zy4dWLxy4duYWP eCCC2PuyKR2FK1XVm17w21jaGeyjAS5zv5c3c+ta4MGHkDtNl8XrId25ZmY8hZIeZP2Z OpMadTKGuHn1CsxhL4Lf2jXw6U6QOdVHQvX7o19Lbtvt95tchemE08R/60a/wLauQ2yf tM3EJ9oYiD8IsNMkMmXUQLxLlKuPBueC2MtpObbSMFMoV6b0adT/9rNOCQhwoADaLpOo Rt3LzJUDSuzXF3ryc/DLhl7WJbhVYotFF/SwQNnBpSdR48ZZ4vRWR4SCR3ImDvY1b5Co W6eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=T/rPv0G2oWHAu/ARUzNVUUqbAgr5yPgMjyFrqjpwQLM=; b=RmKRIYW/Awl3b79K7+WonXQwDQSBb8mpHzKCnlkbqmHoKEK21PtsVuMbh1yoMA/9C6 7dcQRM+3eGDzYL5IxPsvYqVw8N5BgsYGs/GGj8q6sA/SsBVNSCfOYQZxhyJLusbHDX0c oyOSfPsCdgq+yE4hd2Zoh7l8dRvP4hMc1r5bjeya/DRJe6xgmvmVnYC2D/026QWhcHhM i6j2/+Fq/DfYhbqNAMpbvcEzRvcKkvDVeUv572eyxqGQ4mZqRQooGO+Yb6cyksEsFvos lGOitERih9NzbDYrVvAXhrLkAGK56lexCltXcH4umpWjDIrh7rV3rrFVbddepQZ4wN8S KzoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pBdfrdub; 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 t25si471023oic.183.2020.02.20.23.49.13; Thu, 20 Feb 2020 23:49:24 -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; dkim=pass header.i=@kernel.org header.s=default header.b=pBdfrdub; 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 S1728991AbgBUHrx (ORCPT + 99 others); Fri, 21 Feb 2020 02:47:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:43788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728983AbgBUHrt (ORCPT ); Fri, 21 Feb 2020 02:47:49 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B173424650; Fri, 21 Feb 2020 07:47:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271269; bh=xzcDHUr0AgOeeRhMZggU0VLWyxXQOHzz4fX3m50JerA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pBdfrdubnQYnD2B9YXlz2GoSk99kydFezGxpl3sj1lQ0ov0DWCNaYhqZ2TJpjIE8l TuuzEGVSRV3Z2Dh+Vb4a7PFK/kukCM+vosb2szsDCsUcYs6nnbnYDLe+Wci0sDGHcA pduUEoMxMdMcLIPK6G3AXjNfkp2UXSQvvWmC96S4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Douglas Anderson , Matthias Kaehlcke , Stephen Boyd , Sasha Levin Subject: [PATCH 5.5 101/399] clk: qcom: rcg2: Dont crash if our parent cant be found; return an error Date: Fri, 21 Feb 2020 08:37:06 +0100 Message-Id: <20200221072412.231451921@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Douglas Anderson [ Upstream commit 908b050114d8fefdddc57ec9fbc213c3690e7f5f ] When I got my clock parenting slightly wrong I ended up with a crash that looked like this: Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 ... pc : clk_hw_get_rate+0x14/0x44 ... Call trace: clk_hw_get_rate+0x14/0x44 _freq_tbl_determine_rate+0x94/0xfc clk_rcg2_determine_rate+0x2c/0x38 clk_core_determine_round_nolock+0x4c/0x88 clk_core_round_rate_nolock+0x6c/0xa8 clk_core_round_rate_nolock+0x9c/0xa8 clk_core_set_rate_nolock+0x70/0x180 clk_set_rate+0x3c/0x6c of_clk_set_defaults+0x254/0x360 platform_drv_probe+0x28/0xb0 really_probe+0x120/0x2dc driver_probe_device+0x64/0xfc device_driver_attach+0x4c/0x6c __driver_attach+0xac/0xc0 bus_for_each_dev+0x84/0xcc driver_attach+0x2c/0x38 bus_add_driver+0xfc/0x1d0 driver_register+0x64/0xf8 __platform_driver_register+0x4c/0x58 msm_drm_register+0x5c/0x60 ... It turned out that clk_hw_get_parent_by_index() was returning NULL and we weren't checking. Let's check it so that we don't crash. Fixes: ac269395cdd8 ("clk: qcom: Convert to clk_hw based provider APIs") Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Link: https://lkml.kernel.org/r/20200203103049.v4.1.I7487325fe8e701a68a07d3be8a6a4b571eca9cfa@changeid Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/qcom/clk-rcg2.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c index 5e0f7d8f168dd..cecdb07ce13ba 100644 --- a/drivers/clk/qcom/clk-rcg2.c +++ b/drivers/clk/qcom/clk-rcg2.c @@ -217,6 +217,9 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f, clk_flags = clk_hw_get_flags(hw); p = clk_hw_get_parent_by_index(hw, index); + if (!p) + return -EINVAL; + if (clk_flags & CLK_SET_RATE_PARENT) { rate = f->freq; if (f->pre_div) { -- 2.20.1