Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754807AbbBOMeV (ORCPT ); Sun, 15 Feb 2015 07:34:21 -0500 Received: from unicorn.mansr.com ([81.2.72.234]:50655 "EHLO unicorn.mansr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752556AbbBOMeU (ORCPT ); Sun, 15 Feb 2015 07:34:20 -0500 From: Mans Rullgard To: Mike Turquette , Stephen Boyd , linux-kernel@vger.kernel.org Cc: Rhyland Klein Subject: [PATCH] clk: check for invalid parent index of orphans in __clk_init() Date: Sun, 15 Feb 2015 12:33:49 +0000 Message-Id: <1424003629-11383-1-git-send-email-mans@mansr.com> X-Mailer: git-send-email 2.3.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1495 Lines: 39 If a mux clock is initialised (by hardware or firmware) with an invalid parent, its ->get_parent() can return an out of range index. For example, the generic mux clock attempts to return -EINVAL, which due to the u8 return type ends up a rather large number. Using this index with the parent_names[] array results in an invalid pointer and (usually) a crash in the following strcmp(). This patch adds a check for the parent index being in range, ignoring clocks reporting invalid values. Signed-off-by: Mans Rullgard Cc: Rhyland Klein --- drivers/clk/clk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index d48ac71..bc0662b 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1950,7 +1950,8 @@ int __clk_init(struct device *dev, struct clk *clk) hlist_for_each_entry_safe(orphan, tmp2, &clk_orphan_list, child_node) { if (orphan->num_parents && orphan->ops->get_parent) { i = orphan->ops->get_parent(orphan->hw); - if (!strcmp(clk->name, orphan->parent_names[i])) + if (i >= 0 && i < orphan->num_parents && + !strcmp(clk->name, orphan->parent_names[i])) __clk_reparent(orphan, clk); continue; } -- 2.3.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/