Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
From:   <nobuhiro1.iwamatsu@toshiba.co.jp>
To:     <gustavoars@kernel.org>, <mturquette@baylibre.com>,
        <sboyd@kernel.org>
CC:     <keescook@chromium.org>, <linux-clk@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>,
        <linux-kernel@vger.kernel.org>, <linux-hardening@vger.kernel.org>
Subject: RE: [PATCH 2/2][next] clk: visconti: Add bounds-checking coverage for
 struct visconti_pll_provider
Thread-Topic: [PATCH 2/2][next] clk: visconti: Add bounds-checking coverage
 for struct visconti_pll_provider
Thread-Index: AQHZ/LJ2dpVjEBIgOEOHBXIfYO2wnbBLemLg
Date:   Sun, 15 Oct 2023 22:50:25 +0000
Message-ID: <TYVPR01MB11245A06AA4A22CE6A1B5676792D0A@TYVPR01MB11245.jpnprd01.prod.outlook.com>
References: <cover.1697076650.git.gustavoars@kernel.org>
 <675633f7ae9893371d35b238f06fd02a3acffebb.1697076650.git.gustavoars@kernel.org>
In-Reply-To: <675633f7ae9893371d35b238f06fd02a3acffebb.1697076650.git.gustavoars@kernel.org>
Accept-Language: ja-JP, en-US
Content-Language: ja-JP
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-2022-jp?B?V1VFL1hNZnpXVlB4MnMrcWZKK1VCVXAzV005VXo4U2ttQ04yOTlVSFI2?=
 =?iso-2022-jp?B?dlhyWFpvNEdidXB1VWJqa3h4ejJCSHB5YXVqUjRYd1lEL3h6TitIMERQ?=
 =?iso-2022-jp?B?bVkzcFVrVGZyWFA3TTh0bitVeHdkWmdISkYrTXJjM205Y1NOcGZaWW5i?=
 =?iso-2022-jp?B?MzVNVlY5dy9iSDFyZ1cxaCtYQzFWTjJJTjNMOXlVQ2YydHJ1TmdEVlFL?=
 =?iso-2022-jp?B?SWdSZ0NDVTJPeFRnenA4cmVtTzA5L1BoL20vQUJqdERwWEZ0em1aUTlN?=
 =?iso-2022-jp?B?QlJ1bmx3SmpyMTg4MUVJb3Z5QkFvS1lLQTU0VmtidWp2NEdpTUNkS3JD?=
 =?iso-2022-jp?B?aW4rZVB4KzZPczBJZ2JheGVCZlh3UkREOTRRVFFNOEJON2dhbkNsRVlt?=
 =?iso-2022-jp?B?cGYzTHozajBGYmZKWGtsSHJJMHFLZDltRTVPc1p4Unp2OWFWNTF4T1BJ?=
 =?iso-2022-jp?B?b25sOVEwRXA2MjMyM3RwaE9XZmRCQUk1a3JPdVZzMUplSy80dk9KeVNO?=
 =?iso-2022-jp?B?OTYyV1VKVzNsVHJ4VzYvelJmS3BIUU4xMTFkTnRYYkd4eEJFVDRPWHd6?=
 =?iso-2022-jp?B?N2c0OUI3a1d0bjFNaXQ1UmhxQllPSGNSN1JFQm42dlB1anJSY1hZa0dr?=
 =?iso-2022-jp?B?ZmFFSTl5K3VmRGppTjV1SHpwK3BqY1B3VXBlOGdWT2NSYi8vS3V6d29z?=
 =?iso-2022-jp?B?VWNBd3pudEZWUWJkRmtiLzRNZUZGaVU3LzBpTUU0bDVWZGNlMkttalpm?=
 =?iso-2022-jp?B?WkVqODc2Rkc4S1k3cXRuc2RzUXIyZ0txYnovWk0ra2w5MVpjLzN2emFy?=
 =?iso-2022-jp?B?WVVlbk5jZDZiQWhyU3g5ZXJFaGZ1Ynp6TW9QQVBaYmlHRm16dE5CMjdP?=
 =?iso-2022-jp?B?M05yM29iUGJ0NWFTZExPeHY3bWxEVitkb0h6Y2FkZEFubXNsbDZIM1NL?=
 =?iso-2022-jp?B?NjlaVW5VN3VicUZCM3dhbGNMNjRsbWJIL1NLdXd4SGdiUGdqb0hlZ2dZ?=
 =?iso-2022-jp?B?YTVnNE10Ri9GYWNwYTlpMWQyWHgxa2toTi9KTU5FNC9SZy93Ymg2STY5?=
 =?iso-2022-jp?B?MW5lbFhRMGgwTThSa2prTFBKYThxR0h2YmVRaFA2eGZldEhiYWs0c2FI?=
 =?iso-2022-jp?B?bHJSd2NaQnVSTDFBVS9LdWdLd0ppcGZhaWlETjVZMEhtRld3YU14cTls?=
 =?iso-2022-jp?B?RGh0cFh2RjNteUhKQ2Zhb0pHMzlRMmI5U2ZFaU1FZ2RnQW5JZGg4KzRn?=
 =?iso-2022-jp?B?cEFOQnc1Q3dKSEhOanpxVlVOWmc2VC8yTXE5eG5KVFlzVlBsNHZRT3NH?=
 =?iso-2022-jp?B?V1lEYjNMMmNXbmt3NFpsZW1ENUNXWXl3VUVzbWpPSVdrOHUySWwwbEoy?=
 =?iso-2022-jp?B?NFZ4dWY5RVA1NURHSXg1akpKM1dsSlVSYXk2Qlk2QUZDR29HWFM1R2o3?=
 =?iso-2022-jp?B?NlJ4ak5CellIbUdUM1VZQ01RMWVtRnBVWFA5NmpQTVpUWk1NUWpHU0hm?=
 =?iso-2022-jp?B?OWtsWnJCWWpwWHRqamNqTTV5WG0zSGZiUXRDVkxWeGExRzNZakV6eGxi?=
 =?iso-2022-jp?B?diswQUtIc0dldzZKVVBzbzFPbm5LOXNHVW8xWWhnYXBPSzg4cEFFQlI2?=
 =?iso-2022-jp?B?MUZ2cTJNMXVLSnlGSjIvNzQ4WnFvSHNrbDRSalE0Rlc2ZEdacHFOTjhk?=
 =?iso-2022-jp?B?TWpIclVXQlBxbUZqamlOTHVqeVhub3dUU0NwN1VhZjg2Rm5lM3FaQitz?=
 =?iso-2022-jp?B?eEJJSG1CSndxUXVxdCtETTFweVAwakMzZ1dIdUFEWTVrZ0V5TVZVTkhw?=
 =?iso-2022-jp?B?dnNhcHpCcnBFSnVUOFNJWk9tVVA5bVZRcE1ibkNNY1ltemFsem9CRDAy?=
 =?iso-2022-jp?B?NkhDZTR3SDJmdlpuQ0t5Q3hvL2prYlNOdU1xTXg5TUEvZDVYYW5GKzU3?=
 =?iso-2022-jp?B?NlF0anR1aXdtTFdWMHlWZFdQWFpiWFowNnJoUGxVVDloczVLYTRoWWV6?=
 =?iso-2022-jp?B?L3RhT00xN1ZGMDMycmYzbnY0OStQdnkxVUVtSENlZFU3d0hDeUpidDlv?=
 =?iso-2022-jp?B?T3g1ZWt1ajFJRnUvNUllOTFaWlN1TC9FaVU5ZWRFa0tyR0JaRUphT1B3?=
 =?iso-2022-jp?B?bUhtZWlCbzQ4QjdPZGpHM24xTEQveGlQVG92TjdaRFl3TUFlUHdINWtY?=
 =?iso-2022-jp?B?dFUrQW5VUHlGQkZxcGNJWlJkMFJiUGpMRUlISkZsSzRTRVRBZ1ZGSDd6?=
 =?iso-2022-jp?B?NkJoWm42YUpvUUF4RmF4SVZabnpCR3F1YVBscTR0UmM3MEI0MzBvWWJk?=
 =?iso-2022-jp?B?ZHl3MjBsNFV4ODdHdkZmalpuQVRsUU9TMHc9PQ==?=
Content-Type: text/plain; charset="iso-2022-jp"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: toshiba.co.jp
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: TYVPR01MB11245.jpnprd01.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 65110d56-d330-4edd-9665-08dbcdd11ebb
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Oct 2023 22:50:25.0447
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: f109924e-fb71-4ba0-b2cc-65dcdf6fbe4f
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: mdCyyMhvKAE2qiZGg8Fx06ryprnLE4fdCZwSnkHpt/O9L2/S1n8hMr4aXi41zChvxo3Wx2Y2tr9qOUcR++evDuNT0CfpTY1L71R+BBaFHwNkfjB/0Eu3094QDf7K1EBR
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB10015
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,
        RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 15 Oct 2023 16:21:40 -0700 (PDT)

Hi Gustavo A. R. Silva,

Thanks for your patch!

> -----Original Message-----
> From: Gustavo A. R. Silva <gustavoars@kernel.org>
> Sent: Thursday, October 12, 2023 11:19 AM
> To: Michael Turquette <mturquette@baylibre.com>; Stephen Boyd
> <sboyd@kernel.org>; iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ＤＩＴ○Ｏ
> ＳＴ) <nobuhiro1.iwamatsu@toshiba.co.jp>
> Cc: Kees Cook <keescook@chromium.org>; linux-clk@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org; Gustavo A.
> R. Silva <gustavoars@kernel.org>; linux-hardening@vger.kernel.org
> Subject: [PATCH 2/2][next] clk: visconti: Add bounds-checking coverage for
> struct visconti_pll_provider
> 
> 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 particular case
> `num`, is updated before the first access to the flex-array member, in this
> particular case array `hws`. See below:
> 
> 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 visconti_pll_provider`:
> 
> drivers/clk/visconti/pll.h:
>  16 struct visconti_pll_provider {
>  17         void __iomem *reg_base;
>  18         struct device_node *node;
>  19
>  20         /* Must be last */
>  21         struct clk_hw_onecell_data clk_data;
>  22 };
> 
> Hence, we need to move the assignments to `ctx->clk_data.num` after
> allocation for `struct visconti_pll_provider` and before accessing the flexible
> array `ctx->clk_data.hws`. And, as assignments for all members in `struct
> visconti_pll_provider` are originally adjacent to each other, relocate all
> assignments together, so we don't split up `ctx->clk_data.hws = nr_plls` from
> the rest. :)
> 
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>

Acked-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>

Best regards,
  Nobuhiro