From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793097527; b=NH/A5EPYAHxO8RIAlVAeRM+YtH/wyac/0YkpTREsj8jL/US3Jk4nziNr0FD+ck8d6KRE 7xpzgq9QkyBaLHkGjW+tba8gd90ddJsdh8AwDVnvrsX/4web0vJQt44ETvNdvE933C6o5 AjnWn2pgsBik0tQaseWEOZ8to48PRad+nHsylgKXPLm5rojfq9nT1ZxzOl4pFAqArhpyI dXJrDICsXEDVW+pAKsojm9V7QU96GiBjxNrYwBzCuNLLFkHiaz5ujenb6FwBL+CVujos0 JG8fQ7EInxU8C29VBp91W6X8w3XmBu5xhzE6AMENKuEcYD2vV1ipZJa3egrr8OHzxAg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793097527; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=FXwzbr01RC3qFTRcykqQkqibGIllJ7arxXZjCgc8U0o=; b=EEAVttMkMN/LS7RFavI5NovY0Z1t83lQo/ac5nY3WnIIVJ5DK7LzPcfFuPdqxkaNY0EK MS90Y6zHMDcwZ/ps64VCa39dzawB5VXgKZ7U4BGTqFPf7fsq72y6x2aIzOYk8lB8BEwZv vQlwxIRdHruzu45qEw0m5zqzGg34KZTu5SIFxkEFbFZM9N1Ob90ztbkZcyPME2D3bUOLL IgqItXP7ltog+l5uQJM4jSjTgdiAzdP+ByZmQuuVp91rqQuwaWECEhJGoQniWH2rkN78X aN+7YIJkQeQzjRAW8zYhaWd1KZzRiMZ8CEn6vGn7An/ef1gl1y+4Ss54y6P9TolnL3Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=enbsc4f2; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99EE4606A322; Tue, 27 Oct 2026 10:38:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=enbsc4f2 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9CE11F01829; Tue, 27 Oct 2026 10:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793097527; bh=FXwzbr01RC3qFTRcykqQkqibGIllJ7arxXZjCgc8U0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=enbsc4f2Oks9BATfQnmlOXqcXXnW6Yv4XctQhX8KNj7aLTT8cnc+IB1uQeNOvHXiT d+zoJJvihvYRvBdhWf27Yyw8GrAjPyTc8OB4NgAbrIKCumo19X8nYkDFLY5NkUOYkT kMr0b5KUnxf7F9SUBNk0p/7QmA7vbyC5+8k7ZmJT+1yKloPHr24Tlu6I4RCdJQUKbo K+Ohibl5SJJAQOkj4A/55UE9LzSTvtHZp6DS2HOEzYXVfjlIXeq0klfyvZ940fcCw/ loqvg+d2RIVD6AuwEQYPec3MyKO0xNyzJxODJLMrmO6/n55Gvg+y76vhqiSwyEN8im 2dV1tria+fHzA== From: Lee Jones To: lee@kernel.org, Matthias Brugger , AngeloGioacchino Del Regno , Sascha Hauer , mfd@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: stable@vger.kernel.org Subject: [PATCH v2 24/27] mfd: mt6397: Manage IRQ domain lifecycle with devres Date: Tue, 27 Oct 2026 09:30:53 +0000 Message-ID: <20261027093306.2812695-25-lee@kernel.org> X-Mailer: git-send-email 2.56.0.307.g5fe7bd680c-goog In-Reply-To: <20261027093306.2812695-1-lee@kernel.org> References: <20261027093306.2812695-1-lee@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit mt6397_irq_init() and mt6358_irq_init() create chip->irq_domain with irq_domain_create_linear() before registering the parent interrupt via devm_request_threaded_irq(). If devm_mfd_add_devices() fails in mt6397_probe(), irq_domain_remove() is called before devres frees the threaded IRQ and without disposing child IRQ mappings, allowing an in-flight interrupt handler or late IRQ lookup to dereference the removed domain. Conversely, when the driver is unbound, the IRQ mappings and domain are never removed at all. Register a devres action immediately after irq_domain_create_linear() to dispose all mapped hardware interrupts and remove chip->irq_domain so that the domain is torn down after child MFD devices and the managed IRQ handler have been released on both probe failure and unbind. Fixes: 6df8dd5c185b ("mfd: Add support for the MediaTek MT6397 PMIC") Closes: https://sashiko.dev/#/bug/linux-b296fbe4-6e83-40c0-91c7-2c31e8d226d0 Cc: stable@vger.kernel.org Signed-off-by: Lee Jones --- drivers/mfd/mt6358-irq.c | 17 ++++++++++++++++- drivers/mfd/mt6397-core.c | 4 +--- drivers/mfd/mt6397-irq.c | 16 +++++++++++++++- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/mt6358-irq.c b/drivers/mfd/mt6358-irq.c index 74cf20843044..c747cae909ea 100644 --- a/drivers/mfd/mt6358-irq.c +++ b/drivers/mfd/mt6358-irq.c @@ -224,6 +224,17 @@ static const struct irq_domain_ops mt6358_irq_domain_ops = { .xlate = irq_domain_xlate_twocell, }; +static void mt6358_irq_domain_remove(void *data) +{ + struct mt6397_chip *chip = data; + struct pmic_irq_data *irqd = chip->irq_data; + + for (unsigned int hwirq = 0; hwirq < irqd->num_pmic_irqs; hwirq++) + irq_dispose_mapping(irq_find_mapping(chip->irq_domain, hwirq)); + + irq_domain_remove(chip->irq_domain); +} + int mt6358_irq_init(struct mt6397_chip *chip) { int i, j, ret; @@ -279,13 +290,17 @@ int mt6358_irq_init(struct mt6397_chip *chip) return -ENODEV; } + ret = devm_add_action_or_reset(chip->dev, mt6358_irq_domain_remove, + chip); + if (ret) + return ret; + ret = devm_request_threaded_irq(chip->dev, chip->irq, NULL, mt6358_irq_handler, IRQF_ONESHOT, mt6358_irq_chip.name, chip); if (ret) { dev_err(chip->dev, "Failed to register IRQ=%d, ret=%d\n", chip->irq, ret); - irq_domain_remove(chip->irq_domain); return ret; } diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index 9ec951996588..e94e37cba249 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -395,10 +395,8 @@ static int mt6397_probe(struct platform_device *pdev) ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, pmic_core->cells, pmic_core->cell_size, NULL, 0, pmic->irq_domain); - if (ret) { - irq_domain_remove(pmic->irq_domain); + if (ret) dev_err(&pdev->dev, "failed to add child devices: %d\n", ret); - } return ret; } diff --git a/drivers/mfd/mt6397-irq.c b/drivers/mfd/mt6397-irq.c index 5d2e5459f744..58645dbd8095 100644 --- a/drivers/mfd/mt6397-irq.c +++ b/drivers/mfd/mt6397-irq.c @@ -169,6 +169,16 @@ static int mt6397_irq_pm_notifier(struct notifier_block *notifier, return NOTIFY_DONE; } +static void mt6397_irq_domain_remove(void *data) +{ + struct mt6397_chip *chip = data; + + for (int hwirq = 0; hwirq < MT6397_IRQ_NR; hwirq++) + irq_dispose_mapping(irq_find_mapping(chip->irq_domain, hwirq)); + + irq_domain_remove(chip->irq_domain); +} + int mt6397_irq_init(struct mt6397_chip *chip) { int ret; @@ -223,13 +233,17 @@ int mt6397_irq_init(struct mt6397_chip *chip) return -ENOMEM; } + ret = devm_add_action_or_reset(chip->dev, mt6397_irq_domain_remove, + chip); + if (ret) + return ret; + ret = devm_request_threaded_irq(chip->dev, chip->irq, NULL, mt6397_irq_thread, IRQF_ONESHOT, "mt6397-pmic", chip); if (ret) { dev_err(chip->dev, "failed to register irq=%d; err: %d\n", chip->irq, ret); - irq_domain_remove(chip->irq_domain); return ret; } -- 2.56.0.307.g5fe7bd680c-goog