From patchwork Tue Dec 6 02:59:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChiYuan Huang X-Patchwork-Id: 13065351 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 60FBCC47089 for ; Tue, 6 Dec 2022 03:00:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ZrDE1AG2IYRfdCIV0hk8bF65eku5xVtOSaXqx+iZ9sg=; b=OuEsefSBDQbc1x AHVTuu2SBNa6QU1M12GXTa9eVIuH2d9pp8HZAk5fejvvZsuK4OfB+ACz8VpD3h2j6AqrYLN5AtQ/k cw+K+neItC+RMbH5lfTkF5pvy0ziybi5s4jd/P4tKnnMFC72RA5z7a0OyBdn1sYC/Fm61p+iaokG8 qNlB6lmULdBy6DU5SNgWX0ydNYaszFonhfI8lS5FwUm7zzDe1JvgxSKNnyFZXPD7bppQSMBqtKrcY lj9iqrUboo57P9eGrcGTpSTW1HnBMkiC+HTqWgcLgShH8xeUYjjs+GKiOAvtevFIa+ntPJomNiB5t 9griu6Bj8pAVZ+oWErVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2OB8-00GBIo-7f; Tue, 06 Dec 2022 02:59:30 +0000 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2OB4-00GB9h-Ki for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2022 02:59:28 +0000 Received: by mail-pl1-x631.google.com with SMTP id m4so5724644pls.4 for ; Mon, 05 Dec 2022 18:59:24 -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=U/4Cj9/05hjAE/KmGhJWxXDEiM3adoyVLnClbzSb1Z8=; b=FFFvWECPjGLnVyC1xHSAxk+j+228qCLvo8kybrm5bnCmzaC67KvmBX0un9mY0+kGHP xq116qzlCeV/O026EgTv4iDlnoUcEfCayjBXrmT7V48huVurbKHdvZUTiZcmy/LZpYH9 VBrda2aaCFamlDih0z9Wq1kpGPmULrtIA2exdhMym21QO80bmAtnqomGjwvjRZHbcgDI NlpUfKhoxfe7LWsKwMVWollmCnpjFWcIu0LnRGeFMDLupgJpUwqsUNvoBHqa1ry9mxwh q8JyczeE4xuzM4z8VZQIVWICa3GeA10Y8AweKdti5nmPynrgMiMz6t0VykOGPztCz6CK 8/AQ== 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=U/4Cj9/05hjAE/KmGhJWxXDEiM3adoyVLnClbzSb1Z8=; b=S5WK0fSD6usMvcuGm+/ICXyYR3V8X6hW1rlDIJCyQKtVPFO7117qbGVXLwDhtAMQuK 2d5Cv1cFlXkQ1tas3TgcYmR4TdZ9N5B1rroJWPCfX/9vl7Iw8zUdu84QZ5OU7rPN8JuG 92CLC01JuVYc/QVJopRLFdP0NUQfUUpfzTm3NB1FTv4Axg7S6A6leId9XUOeiHYnqHh0 Xq6Mr/ZWttjaznyL5eZrsY+hHRaJYloC+XYLR/IcM4X45Ps66RJ+c0fVVFBb4dHDkdz2 aJ4lc1k3PcELCDPYdjp2IvWuHEA+eaeou3nCBjZgXUkNxodONuOxgIr4AXiH5JToIhVQ T36g== X-Gm-Message-State: ANoB5pn/Ugb0mdzznUaH5s9mSbD6wsftp3sP5KJJp35Zn8eYTHr96DS9 hQYpFasd96g9TgbguhcF4cQ= X-Google-Smtp-Source: AA0mqf5txxt8YXiv04XTW3H78mBdu/lkOdTzM4RB5w74XmUrgNdIVa3BIXgHhmtNBuBjwusRpIaANg== X-Received: by 2002:a17:90a:5918:b0:213:df25:7e8a with SMTP id k24-20020a17090a591800b00213df257e8amr100059081pji.154.1670295563642; Mon, 05 Dec 2022 18:59:23 -0800 (PST) Received: from localhost.localdomain ([2402:7500:587:6b8b:a5d3:fc1e:41e4:9160]) by smtp.gmail.com with ESMTPSA id c6-20020a170902d48600b0017f72a430adsm11315090plg.71.2022.12.05.18.59.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Dec 2022 18:59:21 -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, 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] regulator: core: Use different devices for resource allocation and DT lookup Date: Tue, 6 Dec 2022 10:59:08 +0800 Message-Id: <1670295548-19598-1-git-send-email-u0084500@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221205_185926_749713_DC83561B X-CRM114-Status: GOOD ( 19.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 --- Hi, Mark: I have already tested on MT6370. It works. Due to 'regulator_register' API change, There're still two existing users use it. I also modify it by the way. --- 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..c5e3e54d 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(int3742->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,