From patchwork Tue Oct 24 03:30:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 157233 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1694106vqx; Mon, 23 Oct 2023 20:31:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEa9NqmwHaFXuOzOdjKtZPOwojKP3WwwwruSHdruCW/NdAjd+Lqt+u9paqkEbZoCsXJ9Mh8 X-Received: by 2002:a17:903:41ce:b0:1ca:e576:630e with SMTP id u14-20020a17090341ce00b001cae576630emr6373707ple.0.1698118291377; Mon, 23 Oct 2023 20:31:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698118291; cv=none; d=google.com; s=arc-20160816; b=i0+6E/KiWQ39qG7XuoVQWhb9oL9TXc6S77Lk0QY9ViRI+lwUuzb+OuRC6yaIhUHE1t ++mxmdblZpeSt2i1LUI3WoxZgWooaJHJCivB5LP87w2Q0yWSCFJi1mEEnc5nQR96T9t/ hhkcBb4/mFx70QxdYBuOJh9TJpVch7nDq6l8TdbiJHExAksMv+XPAfTgs4H0FPnuK8f8 yphud7TIonVFl9ScCBkGid+2rypXucrTN0wvRcfy0cHRmaQ1cxWQtmMXu9xA+nu4hc2o 5Qeneqw+gTdqWQ8cvreFeb+lBkjX6+Oyi5bavwr5lW+x1wJJp2gE8B9JqIUC6Y7i4SJg wJYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=RmrXCUZYYykKcPLGYDJMFXoeJw/LAnfOVpYACMLC4rc=; fh=qaZb5b+SzlEk47W9CGrElWwI4fh1SuXzc0IA2pDWKLg=; b=wpUjcL8ifLOH7SSEFUTGhn9fq2SZ8HWB5r0L8gACv1hPLPfg+a07ptYNtzHMRt0m3y x7eLKuv6K4jRbDt8R1VROcWH9ASOuygY9Dd2A7Pzk5NyPKZTGqWgZ604Z8jc+KbhwWAR LnWOlyM+dereOBxRWEw8m4ak19Ia1E0zCZbjW4VOkA7chvVOTdcGx0vk2PAEubMPKIkr 7fTmWWTx+YOM1iARe1besgL3AdQaWjl0PruJxOxjQ3WAg6j86EVTrwCxEiUTuQOE/Opz KxC54pej363u6ckqCAgDqegcsrZoAqmT0aXTWCFIDjbOzW0174nZuRX0BV/uCDoQJ8Xe 9xww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="f+irlN/7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id 4-20020a170902e9c400b001c76a06b5b5si7393629plk.298.2023.10.23.20.31.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 20:31:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="f+irlN/7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id DBF9280505D2; Mon, 23 Oct 2023 20:31:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232128AbjJXDbF (ORCPT + 27 others); Mon, 23 Oct 2023 23:31:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232277AbjJXDa5 (ORCPT ); Mon, 23 Oct 2023 23:30:57 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2579B10EA; Mon, 23 Oct 2023 20:30:56 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA3DAC433C8; Tue, 24 Oct 2023 03:30:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698118255; bh=s2DIwsxOJaZ9zsr4JNYc5p8TJXF9cLRH/ZrueUMU/kY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=f+irlN/7SvXYp9rwDXIKvQpmEp1WWku8+apGg+TVfCP465udfUJYadCRMK9AAbNoK iREIT0vC+DttBAnedoilASso8OAjhgAMjaj5cj0tC4MY0xGgwqquKiuGSrbfiQGb2O v5nW+j4MPmkNFTOppHzBJe+onzv/CMDhVIH0isAOZNGj7ZUKf5Ck6hZHfeI1YD/ieF 0MFpGg8VjcLhTNOdquKYlm5/ewuLOMx++rm7/epKbXEhjnmnKybjo0f90DLPMp3vaK v5n6PGXSnr9X4DU/qqmJTkO/rHZRt/oE+xxu4GPquRjAbzcq2furfbP7edoJgAid6T tm554wQKcSyww== Date: Mon, 23 Oct 2023 21:30:52 -0600 From: "Gustavo A. R. Silva" To: Dinh Nguyen , Michael Turquette , Stephen Boyd Cc: Kees Cook , linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH v3 1/2][next] clk: socfpga: Fix undefined behavior bug in struct stratix10_clock_data Message-ID: <1da736106d8e0806aeafa6e471a13ced490eae22.1698117815.git.gustavoars@kernel.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 23 Oct 2023 20:31:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780606085469231616 X-GMAIL-MSGID: 1780606085469231616 `struct clk_hw_onecell_data` is a flexible structure, which means that it contains flexible-array member at the bottom, in this case array `hws`: include/linux/clk-provider.h: 1380 struct clk_hw_onecell_data { 1381 unsigned int num; 1382 struct clk_hw *hws[] __counted_by(num); 1383 }; This could potentially lead to an overwrite of the objects following `clk_data` in `struct stratix10_clock_data`, in this case `void __iomem *base;` at run-time: drivers/clk/socfpga/stratix10-clk.h: 9 struct stratix10_clock_data { 10 struct clk_hw_onecell_data clk_data; 11 void __iomem *base; 12 }; There are currently three different places where memory is allocated for `struct stratix10_clock_data`, including the flex-array `hws` in `struct clk_hw_onecell_data`: drivers/clk/socfpga/clk-agilex.c: 469 clk_data = devm_kzalloc(dev, struct_size(clk_data, clk_data.hws, 470 num_clks), GFP_KERNEL); drivers/clk/socfpga/clk-agilex.c: 509 clk_data = devm_kzalloc(dev, struct_size(clk_data, clk_data.hws, 510 num_clks), GFP_KERNEL); drivers/clk/socfpga/clk-s10.c: 400 clk_data = devm_kzalloc(dev, struct_size(clk_data, clk_data.hws, 401 num_clks), GFP_KERNEL); I'll use just one of them to describe the issue. See below. Notice that a total of 440 bytes are allocated for flexible-array member `hws` at line 469: include/dt-bindings/clock/agilex-clock.h: 70 #define AGILEX_NUM_CLKS 55 drivers/clk/socfpga/clk-agilex.c: 459 struct stratix10_clock_data *clk_data; 460 void __iomem *base; ... 466 467 num_clks = AGILEX_NUM_CLKS; 468 469 clk_data = devm_kzalloc(dev, struct_size(clk_data, clk_data.hws, 470 num_clks), GFP_KERNEL); `struct_size(clk_data, clk_data.hws, num_clks)` above translates to sizeof(struct stratix10_clock_data) + sizeof(struct clk_hw *) * 55 == 16 + 8 * 55 == 16 + 440 ^^^ | allocated bytes for flex-array `hws` 474 for (i = 0; i < num_clks; i++) 475 clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); 476 477 clk_data->base = base; and then some data is written into both `hws` and `base` objects. Fix this by placing the declaration of object `clk_data` at the end of `struct stratix10_clock_data`. Also, add a comment to make it clear that this object must always be last in the structure. -Wflex-array-member-not-at-end is coming in GCC-14, and we are getting ready to enable it globally. Fixes: ba7e258425ac ("clk: socfpga: Convert to s10/agilex/n5x to use clk_hw") Cc: stable@vger.kernel.org Reviewed-by: Kees Cook Signed-off-by: Gustavo A. R. Silva --- Changes in v3: - None, really. Just Cc linux-clk@vger.kernel.org this time. Changes in v2: - Mention -Wflex-array-member-not-at-end in the changelog text. - Link: https://lore.kernel.org/linux-hardening/bb2ae50abf622d4b6fda1a326ce830627356ab7c.1697493574.git.gustavoars@kernel.org/ v1: - Link: https://lore.kernel.org/linux-hardening/5dd8483177dc8cd91d021170b6717f2e570bab03.1697059539.git.gustavoars@kernel.org/ drivers/clk/socfpga/stratix10-clk.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/clk/socfpga/stratix10-clk.h b/drivers/clk/socfpga/stratix10-clk.h index 75234e0783e1..83fe4eb3133c 100644 --- a/drivers/clk/socfpga/stratix10-clk.h +++ b/drivers/clk/socfpga/stratix10-clk.h @@ -7,8 +7,10 @@ #define __STRATIX10_CLK_H struct stratix10_clock_data { - struct clk_hw_onecell_data clk_data; void __iomem *base; + + /* Must be last */ + struct clk_hw_onecell_data clk_data; }; struct stratix10_pll_clock { From patchwork Tue Oct 24 03:31:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 157234 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1694345vqx; Mon, 23 Oct 2023 20:32:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxj0SiZzP+/cj5QrgD1xymj92DrrZqw3zKvY4XjslzEPQxcOYW8tgdw3Bi/P1afUjH4E+z X-Received: by 2002:a17:903:32c8:b0:1ca:8a38:38c4 with SMTP id i8-20020a17090332c800b001ca8a3838c4mr11332831plr.27.1698118338737; Mon, 23 Oct 2023 20:32:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698118338; cv=none; d=google.com; s=arc-20160816; b=Kczuvdb9Dn9qT1WOB9ePYPy/xFyIVBpL175vdyz1rgNAZy9DbqnwIVi44AvBFdGG17 Zwpi8EH5vsr/bungLyD4KA9U+Jf9V4n7Oco2OL1wcITtOkXDtS1DajDBQ18HA6RcNSfU j6nZu2fCOCslxS1d+8LzfuyYqRAWIM7gt8H9G0AMM5PFBOj5ctMPHDzw4rLK5w3FwzFI 5mcJJL0CnRcSZmvUulz6nmflyMWNQbxJnISo5YM123of9efs+9SHQBLHMTAouDZna45G fkDderqr/hAa/+K0oFAs5BG1NM41KfbJEJI4hj6YvNvb1Y4wTA9CH1/7LIxx/hhpQbok DD7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=bZunx28yMVAZfDm+0yQ+bSRMnQEIK4aAt445GPFfuwg=; fh=qaZb5b+SzlEk47W9CGrElWwI4fh1SuXzc0IA2pDWKLg=; b=eO3D9l5yplXJOQnZ2Rkxz0LcGBRIq5acUjLNbOr1NUYq41UiGP6BHqPr/Jfn9WGvUi rmoNDbQh7BDNVsnFkSrwU1fEX3s9XjebVfgJTvGlOwEL+P4TiCqhALjXGvqCm7eLkPYD 3PkL2D97RmcfPQDYPo1W+irOcaDvLdt05arQz2ur9/bOVcHxtNIrrORZ6uSTpEgobpLg VNYR3wJaWxDAhn6x4LOuJShq/bs4uSmzx/S0U8L8EsHOPEWvB2uN5tlpjNmYx2rMeO0j oMXa/5Z7+96VJJt4uxzMuisNlWoXotdTj33slc0IfqseW52zgG3m5gDX1rm0s86FgJxz RCYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=d482tgTR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id j18-20020a170902da9200b001bba7713547si7609451plx.151.2023.10.23.20.32.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 20:32:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=d482tgTR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 076A480505DD; Mon, 23 Oct 2023 20:32:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232042AbjJXDbu (ORCPT + 27 others); Mon, 23 Oct 2023 23:31:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231865AbjJXDbt (ORCPT ); Mon, 23 Oct 2023 23:31:49 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 561619F; Mon, 23 Oct 2023 20:31:46 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D3BDC433C8; Tue, 24 Oct 2023 03:31:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698118306; bh=FyxQRoyABjxA1s7iHpRFuk9i7fK0p0gpD74X0piO/30=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=d482tgTROHc0UMrauf8piBvV2BSYBoHJ0ugOhrKRpW1Of5vRvcg0pzmix8Q/ZBDOc QWyI9Mn6a5reMdqwe9nNeP4idQCzHA5A3d6wj33RpX4NwgaQ3tvsoV4Y6HkK5TsFFQ 2by2MIY/eqUf/sIueq0RapD6WenpkWr3g+qMFQRyzjXthUhYo32KqLXH5wT62XfbqC NJXQMNKBALEq3O24J/q92RKxOxO1olS1Nhb7RhSUhvXf14XJofMOCz+Qn+guhABU2F PsJwMMEjwY0GmRCfTkbiL7hcXR03hAcLxfRAhLK56UcOXtUnFY09xSSr40gAvRjjSW nKKTKhlCHEpLQ== Date: Mon, 23 Oct 2023 21:31:42 -0600 From: "Gustavo A. R. Silva" To: Dinh Nguyen , Michael Turquette , Stephen Boyd Cc: Kees Cook , linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH v3 2/2][next] clk: socfpga: agilex: Add bounds-checking coverage for struct stratix10_clock_data Message-ID: <385c516c498e07eb9a521107e16a7efd26e86ea5.1698117815.git.gustavoars@kernel.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 23 Oct 2023 20:32:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780606135363115220 X-GMAIL-MSGID: 1780606135363115220 In order to gain the bounds-checking coverage that __counted_by provides to flexible-array members at run-time via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions), we must make sure that the counter member, in this case `num`, is updated before the first access to the flex-array member, in this case array `hws`. commit f316cdff8d67 ("clk: Annotate struct clk_hw_onecell_data with __counted_by") introduced `__counted_by` for `struct clk_hw_onecell_data` together with changes to relocate some of assignments of counter `num` before `hws` is accessed: include/linux/clk-provider.h: 1380 struct clk_hw_onecell_data { 1381 unsigned int num; 1382 struct clk_hw *hws[] __counted_by(num); 1383 }; However, this structure is used as a member in other structs, in this case in `struct sstratix10_clock_data`: drivers/clk/socfpga/stratix10-clk.h: 9 struct stratix10_clock_data { 10 void __iomem *base; 11 12 /* Must be last */ 13 struct clk_hw_onecell_data clk_data; 14 }; Hence, we need to move the assignments to `clk_data->clk_data.num` after allocations for `struct stratix10_clock_data` and before accessing the flexible array `clk_data->clk_data.hws`. And, as assignments for both `clk_data->clk_data.num` and `clk_data->base` are originally adjacent to each other, relocate both assignments together. Reviewed-by: Kees Cook Signed-off-by: Gustavo A. R. Silva --- Changes in v3: - None, really. Just Cc linux-clk@vger.kernel.org this time. Changes in v2: - None. - Link: https://lore.kernel.org/linux-hardening/f531ae35ef434b62f48534c67ad3b1013bff0536.1697493574.git.gustavoars@kernel.org/ v1: - Link: https://lore.kernel.org/linux-hardening/fd4cd8503316d536e1a84fa2ae5bdefdd4b24afe.1697059539.git.gustavoars@kernel.org/ drivers/clk/socfpga/clk-agilex.c | 12 ++++++------ drivers/clk/socfpga/clk-s10.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/clk/socfpga/clk-agilex.c b/drivers/clk/socfpga/clk-agilex.c index 6b65a74aefa6..8dd94f64756b 100644 --- a/drivers/clk/socfpga/clk-agilex.c +++ b/drivers/clk/socfpga/clk-agilex.c @@ -471,12 +471,12 @@ static int agilex_clkmgr_init(struct platform_device *pdev) if (!clk_data) return -ENOMEM; + clk_data->clk_data.num = num_clks; + clk_data->base = base; + for (i = 0; i < num_clks; i++) clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); - clk_data->base = base; - clk_data->clk_data.num = num_clks; - agilex_clk_register_pll(agilex_pll_clks, ARRAY_SIZE(agilex_pll_clks), clk_data); agilex_clk_register_c_perip(agilex_main_perip_c_clks, @@ -511,12 +511,12 @@ static int n5x_clkmgr_init(struct platform_device *pdev) if (!clk_data) return -ENOMEM; - for (i = 0; i < num_clks; i++) - clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); - clk_data->base = base; clk_data->clk_data.num = num_clks; + for (i = 0; i < num_clks; i++) + clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); + n5x_clk_register_pll(agilex_pll_clks, ARRAY_SIZE(agilex_pll_clks), clk_data); n5x_clk_register_c_perip(n5x_main_perip_c_clks, diff --git a/drivers/clk/socfpga/clk-s10.c b/drivers/clk/socfpga/clk-s10.c index 3752bd9c103c..b4bf4e2d38e1 100644 --- a/drivers/clk/socfpga/clk-s10.c +++ b/drivers/clk/socfpga/clk-s10.c @@ -402,12 +402,12 @@ static int s10_clkmgr_init(struct platform_device *pdev) if (!clk_data) return -ENOMEM; - for (i = 0; i < num_clks; i++) - clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); - clk_data->base = base; clk_data->clk_data.num = num_clks; + for (i = 0; i < num_clks; i++) + clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); + s10_clk_register_pll(s10_pll_clks, ARRAY_SIZE(s10_pll_clks), clk_data); s10_clk_register_c_perip(s10_main_perip_c_clks,