From patchwork Tue Dec 6 07:22:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChiYuan Huang X-Patchwork-Id: 13065471 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1465AC352A1 for ; Tue, 6 Dec 2022 07:22:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230280AbiLFHWc (ORCPT ); Tue, 6 Dec 2022 02:22:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbiLFHWb (ORCPT ); Tue, 6 Dec 2022 02:22:31 -0500 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CDBE1006B; Mon, 5 Dec 2022 23:22:30 -0800 (PST) Received: by mail-pl1-x634.google.com with SMTP id y4so13116888plb.2; Mon, 05 Dec 2022 23:22:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WxNzd0yC3qwgQDhnRz1Ev/ksDutfVRDwrKayBK3dj6I=; b=nj0w386c2uOUyE+/S3GQtH3CKBtVKNGuuRmkl1nErWhuIhr1FyI7asIfsHcguO4R34 YYGiIUazjqpPpFYyWuBO5YVHxs7UAcVo8vdUJYXzABNgnZHdy81i5nrKNVCh0/yBHC3/ 0V5MY1Si4Yh3rzlJMZqRBGn0Tp6zqBimr+qKmcybGSSx26OE1+KILHBwr1ODq9D0CIrE 7dZ5xEC670nazzLmPfqx/i1T/R4we7ShLAxC2Ui3hW8ZEPHc0Ib2qiPfu6Jwazue9P33 bAgXl7vrmzAAEexokBmS1rTcBiS+OukpHkl2h0bZpWTIwihqVbnGXeBGSDWbdRzSVc9q tYvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WxNzd0yC3qwgQDhnRz1Ev/ksDutfVRDwrKayBK3dj6I=; b=sRvtFkObAaa92wIzCbP1UlIS5Cm39AsTDxdq8+neubhYUsyVaqbB6wQlr8/SYp8s7i dEgB0oDjmVM1V9XMrv7lDF9AbUdUZZI3fix1M70pYVFQhtcUMvTgAJ4OpN8NtcZw7Qa6 w6aAnDD1obvEyOzGLrsCNJWnB5gLN9qMPiRELhAvRXzRngw2WNAUyOOnR3BLEHVqJ9V2 mDwhDnWxMGsKrQCXkUEl6K3HJJr3P6vcZ/rY3kdtFv5CgGrCuNUPqa/mrwOrFrOrAafn BMsYkOOxuVllS+1kWph9Z12GAQ7v9ttKi8dgDuE+/lMLQ3Ppm3Z5aKPgiTmDK71sgzWT P3bw== X-Gm-Message-State: ANoB5pl8/EqPxRFH7tX6gdwVAYAFxX4ql0ODzF7G7vM6qjY+C9UtsWIF 1WtfZQIA1IXSEKogcw+sQTA= X-Google-Smtp-Source: AA0mqf5tSHwejyfUgghNmWPuKMc8WPsmEjH4iHLBdOntZg6frpmHlDokrDlsTP/RyrvsM8ZWUfZMKg== X-Received: by 2002:a17:902:7c0e:b0:186:7395:e36a with SMTP id x14-20020a1709027c0e00b001867395e36amr80917100pll.83.1670311349331; Mon, 05 Dec 2022 23:22:29 -0800 (PST) Received: from localhost.localdomain ([49.216.44.139]) by smtp.gmail.com with ESMTPSA id u11-20020a17090341cb00b00187033cac81sm11857324ple.145.2022.12.05.23.22.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Dec 2022 23:22:28 -0800 (PST) From: cy_huang To: broonie@kernel.org Cc: djrscally@gmail.com, hdegoede@redhat.com, markgross@kernel.org, lgirdwood@gmail.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, yangyingliang@huawei.com, gene_chen@richtek.com, chiaen_wu@richtek.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, ChiYuan Huang Subject: [PATCH v2] regulator: core: Use different devices for resource allocation and DT lookup Date: Tue, 6 Dec 2022 15:22:21 +0800 Message-Id: <1670311341-32664-1-git-send-email-u0084500@gmail.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org From: ChiYuan Huang Following by the below discussion, there's the potential UAF issue between regulator and mfd. https://lore.kernel.org/all/20221128143601.1698148-1-yangyingliang@huawei.com/ From the analysis of Yingliang CPU A |CPU B mt6370_probe() | devm_mfd_add_devices() | |mt6370_regulator_probe() | regulator_register() | //allocate init_data and add it to devres | regulator_of_get_init_data() i2c_unregister_device() | device_del() | devres_release_all() | // init_data is freed | release_nodes() | | // using init_data causes UAF | regulator_register() It's common to use mfd core to create child device for the regulator. In order to do the DT lookup for init data, the child that registered the regulator would pass its parent as the parameter. And this causes init data resource allocated to its parent, not itself. The issue happen when parent device is going to release and regulator core is still doing some operation of init data constraint for the regulator of child device. To fix it, this patch expand 'regulator_register' API to use the different devices for init data allocation and DT lookup. Reported-by: Yang Yingliang Signed-off-by: ChiYuan Huang Reported-by: Marek Szyprowski Tested-by: Marek Szyprowski --- loop Yang Yingliang in cc list. Since v2 - Fix typo 'int3742' to 'int3472' for kernel build test --- drivers/platform/x86/intel/int3472/clk_and_regulator.c | 3 ++- drivers/regulator/core.c | 8 ++++---- drivers/regulator/devres.c | 2 +- drivers/regulator/of_regulator.c | 2 +- drivers/regulator/stm32-vrefbuf.c | 2 +- include/linux/regulator/driver.h | 3 ++- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/platform/x86/intel/int3472/clk_and_regulator.c b/drivers/platform/x86/intel/int3472/clk_and_regulator.c index 1cf9589..b2342b3 100644 --- a/drivers/platform/x86/intel/int3472/clk_and_regulator.c +++ b/drivers/platform/x86/intel/int3472/clk_and_regulator.c @@ -185,7 +185,8 @@ int skl_int3472_register_regulator(struct int3472_discrete_device *int3472, cfg.init_data = &init_data; cfg.ena_gpiod = int3472->regulator.gpio; - int3472->regulator.rdev = regulator_register(&int3472->regulator.rdesc, + int3472->regulator.rdev = regulator_register(int3472->dev, + &int3472->regulator.rdesc, &cfg); if (IS_ERR(int3472->regulator.rdev)) { ret = PTR_ERR(int3472->regulator.rdev); diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e8c00a8..ea4a720 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5396,6 +5396,7 @@ static struct regulator_coupler generic_regulator_coupler = { /** * regulator_register - register regulator + * @dev: the device that drive the regulator * @regulator_desc: regulator to register * @cfg: runtime configuration for regulator * @@ -5404,7 +5405,8 @@ static struct regulator_coupler generic_regulator_coupler = { * or an ERR_PTR() on error. */ struct regulator_dev * -regulator_register(const struct regulator_desc *regulator_desc, +regulator_register(struct device *dev, + const struct regulator_desc *regulator_desc, const struct regulator_config *cfg) { const struct regulator_init_data *init_data; @@ -5413,7 +5415,6 @@ regulator_register(const struct regulator_desc *regulator_desc, struct regulator_dev *rdev; bool dangling_cfg_gpiod = false; bool dangling_of_gpiod = false; - struct device *dev; int ret, i; bool resolved_early = false; @@ -5426,8 +5427,7 @@ regulator_register(const struct regulator_desc *regulator_desc, goto rinse; } - dev = cfg->dev; - WARN_ON(!dev); + WARN_ON(!dev || !cfg->dev); if (regulator_desc->name == NULL || regulator_desc->ops == NULL) { ret = -EINVAL; diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c index 3265e75..5c7ff9b 100644 --- a/drivers/regulator/devres.c +++ b/drivers/regulator/devres.c @@ -385,7 +385,7 @@ struct regulator_dev *devm_regulator_register(struct device *dev, if (!ptr) return ERR_PTR(-ENOMEM); - rdev = regulator_register(regulator_desc, config); + rdev = regulator_register(dev, regulator_desc, config); if (!IS_ERR(rdev)) { *ptr = rdev; devres_add(dev, ptr); diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 0aff1c2..cd726d4 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -505,7 +505,7 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev, struct device_node *child; struct regulator_init_data *init_data = NULL; - child = regulator_of_get_init_node(dev, desc); + child = regulator_of_get_init_node(config->dev, desc); if (!child) return NULL; diff --git a/drivers/regulator/stm32-vrefbuf.c b/drivers/regulator/stm32-vrefbuf.c index 30ea3bc..7a454b7 100644 --- a/drivers/regulator/stm32-vrefbuf.c +++ b/drivers/regulator/stm32-vrefbuf.c @@ -210,7 +210,7 @@ static int stm32_vrefbuf_probe(struct platform_device *pdev) pdev->dev.of_node, &stm32_vrefbuf_regu); - rdev = regulator_register(&stm32_vrefbuf_regu, &config); + rdev = regulator_register(&pdev->dev, &stm32_vrefbuf_regu, &config); if (IS_ERR(rdev)) { ret = PTR_ERR(rdev); dev_err(&pdev->dev, "register failed with error %d\n", ret); diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index f9a7461..d3b4a3d 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -687,7 +687,8 @@ static inline int regulator_err2notif(int err) struct regulator_dev * -regulator_register(const struct regulator_desc *regulator_desc, +regulator_register(struct device *dev, + const struct regulator_desc *regulator_desc, const struct regulator_config *config); struct regulator_dev * devm_regulator_register(struct device *dev,