Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2981689imu; Mon, 19 Nov 2018 08:57:28 -0800 (PST) X-Google-Smtp-Source: AJdET5eetLTDiiQPi+P/xI405s6IGsWZsMHnmpn1BWDVZaLfcyJB/ZMz0AXA7NqWuwl52B9OPp2b X-Received: by 2002:a62:4105:: with SMTP id o5-v6mr23241510pfa.85.1542646648777; Mon, 19 Nov 2018 08:57:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542646648; cv=none; d=google.com; s=arc-20160816; b=w6p+HXIYNtZNZTZxDspAl65YXeD9Xeu0sVQ8WSpdOOum7RdyP1ipmbMO9XIyXuG9LO Mxe1yEl+oZ98DdCz1Ac1c7nssYIgs4KmW0ma4wIxi4A6LoTQeDH3/9OFH7IhTpH5HNgy a6uXdhmXbODw7LPsPmjykBGKwtt1GzC4gOp9So4vkyd2ODumEFUmjC7hWapcbgLXeqe1 m3BHNwRK/fwvlp9P0+QE5Q9ddiEspv1U7f+p3LgbY/mx8edmJyRJzuxYwJXtohpV3MG+ JiVuQ2gA7qQM0dmd6kRs+tTNUaJBawOlJCQldFChuzI1/U7EQ0Ap/Vm4Xw96zKwM7etB yLVg== 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=YVRqQx3+k0Zi8wGgN4VYuFxToVdY/APmrAKf+Ld0gRE=; b=WOc7kqhRVCI41vTGh5JaBgvmGEuP2mX5SM6hzNukJnEdnbL4Y9HWfWNLDOhky7VoZc Rsv1gucnf+SMols4/6mw9dfYMQev+dFmuZuAhEAuw6mcxrvdktVpXc7g6BU9VF8IBhQV 7qEBVx4EBuQNsh3Sluzn4gDmNPf1vDoAUXcePD7uJrI74K91YopLfNSmy70MuTFxFfxV dGyjBXdh0hE8UVMcW4HkVX45UIBICRGHjnAXtXjJySJhsTkRAOdTlEM2qshvs6NnQKen JJgP1rOVhk2Z3XLJQ/y6KluH9tqIGGBCRxZCqAvc3pkQ+7b5hS2/zgzuPxZ6EZfpUWar k3EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Q36AoJ9N; 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 19si37120585pgq.215.2018.11.19.08.57.13; Mon, 19 Nov 2018 08:57:28 -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=Q36AoJ9N; 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 S2403849AbeKTDTh (ORCPT + 99 others); Mon, 19 Nov 2018 22:19:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:58796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403841AbeKTDTg (ORCPT ); Mon, 19 Nov 2018 22:19:36 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 310C3208E3; Mon, 19 Nov 2018 16:55:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542646521; bh=ywI6WPXchSNQpbWdSWEI+yeBFwqH/7XVDXPhi1LTyvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q36AoJ9NIncOm8qCIvD/E8xnndjNt4sPHVFifEOAtxsUMccWIXn8LZaURs7LxcYXe YBMbsikVSsxFsy3I5Q/W8bmnjbDWmSqHrE/G9KlYi8BfFlcM4doayn7HPEtcl1g/ep 82nVm3zgnpUxQ+LfmpiVyjf1HbnFt561Awf6sQ7M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ronald Wahl , Ludovic Desroches , Stephen Boyd Subject: [PATCH 4.9 35/83] clk: at91: Fix division by zero in PLL recalc_rate() Date: Mon, 19 Nov 2018 17:29:01 +0100 Message-Id: <20181119162619.472275187@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119162612.046511542@linuxfoundation.org> References: <20181119162612.046511542@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ronald Wahl commit 0f5cb0e6225cae2f029944cb8c74617aab6ddd49 upstream. Commit a982e45dc150 ("clk: at91: PLL recalc_rate() now using cached MUL and DIV values") removed a check that prevents a division by zero. This now causes a stacktrace when booting the kernel on a at91 platform if the PLL DIV register contains zero. This commit reintroduces this check. Fixes: a982e45dc150 ("clk: at91: PLL recalc_rate() now using cached...") Cc: Signed-off-by: Ronald Wahl Acked-by: Ludovic Desroches Signed-off-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman --- drivers/clk/at91/clk-pll.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/clk/at91/clk-pll.c +++ b/drivers/clk/at91/clk-pll.c @@ -133,6 +133,9 @@ static unsigned long clk_pll_recalc_rate { struct clk_pll *pll = to_clk_pll(hw); + if (!pll->div || !pll->mul) + return 0; + return (parent_rate / pll->div) * (pll->mul + 1); }