Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3135365ybl; Sun, 15 Dec 2019 03:41:15 -0800 (PST) X-Google-Smtp-Source: APXvYqyEJrfkFMqph1GxNB52gNR9OUT2LH5gpFJ3lD9rq4wUHUexC6V1mLAHEqUOZQ2Q6MBzswtl X-Received: by 2002:a05:6830:1e8a:: with SMTP id n10mr24725546otr.228.1576410075014; Sun, 15 Dec 2019 03:41:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576410075; cv=none; d=google.com; s=arc-20160816; b=bmq+8vQziXljuopKRj7U9/UYXpKN3roGJI45zdX1RROWMT8JjezKhi51H1B+uEUDfP atLbmoH4STnn51wRZJL7oWfwzTKOC7Ykbb/Rvh93ukA/NVxBfc1ud0P08bBnypaouuYN ZbH0ubft0ZBnO7lIQw25amR6p8sA+KKy2v7yBWtfsDQWL0xwOynziBmFKd+LFLBFr4WK t4iJu0a8xJmucXKZ8w3t34txqzLQMuwC3n85tihx8pImA9COsHHW5hBXf73kwQ5pnqol zJU7RrmTPkiZ/IcHs8bcAuIbbA3zpGfuRHDY+CIz3K2Xc01pYPL2hy+F9GkTjSZZR0Z0 LvLA== 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 :message-id:date:subject:cc:to:from; bh=KROlkXrmRHcDfCYH2MVNXhJZgXvyvuKbYzo6B1UCLFM=; b=MQrzQ7lIuJ/CcoIP/sFR4tAqv0e0NXex1AR1F7rP4BNMUEmOUGETemvYDbYGqTZA6N r+ay8ZGNYPKwi7zQ9vwUB3qG8m02yMUspWQwX72SdCt5R9yi8hPpkpx9V4pAwIg/L2Tt hWvZnVT3vdr4x9f/gbDh/PC5neKRAJvzmmnUmkJ1ssoO1a5ap1gvYL38rH95SiWwOPSM Oqxn/vGpeToMC6EX4E74ckiVMVPS2yAOp6hMVq7w6lVFZBuEvzVAWqhcAR3DJv3i1EQ+ Vidgm+ZXiylRSRlzVcqMtW/z88HlJolUWgEsVdr3bBfkxSM4SVZksquD3VRy8LYoFJx1 P5FA== 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 k2si8711057otp.273.2019.12.15.03.41.03; Sun, 15 Dec 2019 03:41:15 -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 S1726373AbfLOLiz (ORCPT + 99 others); Sun, 15 Dec 2019 06:38:55 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:38039 "EHLO relay12.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726083AbfLOLiz (ORCPT ); Sun, 15 Dec 2019 06:38:55 -0500 Received: from localhost (unknown [88.190.179.123]) (Authenticated sender: repk@triplefau.lt) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 1CEFD200003; Sun, 15 Dec 2019 11:38:51 +0000 (UTC) From: Remi Pommarel To: Neil Armstrong , Jerome Brunet Cc: Michael Turquette , Stephen Boyd , Kevin Hilman , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Remi Pommarel Subject: [PATCH v2] clk: meson: pll: Fix by 0 division in __pll_params_to_rate() Date: Sun, 15 Dec 2019 12:47:05 +0100 Message-Id: <20191215114705.24401-1-repk@triplefau.lt> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some meson pll registers can be initialized with 0 as N value, introducing the following division by 0 when computing rate : UBSAN: Undefined behaviour in drivers/clk/meson/clk-pll.c:75:9 division by zero CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.4.0-rc3-608075-g86c9af8630e1-dirty #400 Call trace: dump_backtrace+0x0/0x1c0 show_stack+0x14/0x20 dump_stack+0xc4/0x100 ubsan_epilogue+0x14/0x68 __ubsan_handle_divrem_overflow+0x98/0xb8 __pll_params_to_rate+0xdc/0x140 meson_clk_pll_recalc_rate+0x278/0x3a0 __clk_register+0x7c8/0xbb0 devm_clk_hw_register+0x54/0xc0 meson_eeclkc_probe+0xf4/0x1a0 platform_drv_probe+0x54/0xd8 really_probe+0x16c/0x438 driver_probe_device+0xb0/0xf0 device_driver_attach+0x94/0xa0 __driver_attach+0x70/0x108 bus_for_each_dev+0xd8/0x128 driver_attach+0x30/0x40 bus_add_driver+0x1b0/0x2d8 driver_register+0xbc/0x1d0 __platform_driver_register+0x78/0x88 axg_driver_init+0x18/0x20 do_one_initcall+0xc8/0x24c kernel_init_freeable+0x2b0/0x344 kernel_init+0x10/0x128 ret_from_fork+0x10/0x18 This checks if N is null before doing the division. Fixes: 7a29a869434e ("clk: meson: Add support for Meson clock controller") Signed-off-by: Remi Pommarel --- Changes since v1: - Change Fix tag - Move null test to .recalc_rate() --- drivers/clk/meson/clk-pll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index ddb1e5634739..4d3a8003ca20 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c @@ -77,6 +77,10 @@ static unsigned long meson_clk_pll_recalc_rate(struct clk_hw *hw, unsigned int m, n, frac; n = meson_parm_read(clk->map, &pll->n); + /* Some hw may have n set to 0 at init, avoid div by 0 in that case */ + if (n == 0) + return 0; + m = meson_parm_read(clk->map, &pll->m); frac = MESON_PARM_APPLICABLE(&pll->frac) ? -- 2.24.0